Make private fields

Author: kunall17

app/src/androidTest/java/com/zulip/android/activities/LoginDevAuthTest.java

@@ -58,7 +58,7 @@ public void setup() {
         closeSoftKeyboard();
     }
 
-    public void getDevEmails() {
+    private void getDevEmails() {
 
         closeSoftKeyboard();
         //Uncheck Checkbox
@@ -106,7 +106,7 @@ protected boolean matchesSafely(Button item) {
     }
 
 
-    public void loginThroughDevMail() {
+    private void loginThroughDevMail() {
 
         //If EMAIL not specified click on first EMAIL.
         if (EMAIL_TEST.equals("")) {
@@ -121,7 +121,7 @@ public void loginThroughDevMail() {
         assertThat(ZulipApp.get().getEmail(), is(EMAIL_TEST));
     }
 
-    public static ViewAssertion hasItemsCount() {
+    private static ViewAssertion hasItemsCount() {
         return new ViewAssertion() {
             @Override
             public void check(View view, NoMatchingViewException e) {

app/src/androidTest/java/com/zulip/android/test/UnsortedTests.java

@@ -28,9 +28,9 @@
 
 public class UnsortedTests extends ActivityUnitTestCase<ZulipActivity> {
 
-    public static final String TESTUSER_EXAMPLE_COM = "[email protected]";
+    private static final String TESTUSER_EXAMPLE_COM = "[email protected]";
     private ZulipApp app;
-    RuntimeExceptionDao<Message, Object> messageDao;
+    private RuntimeExceptionDao<Message, Object> messageDao;
 
     public UnsortedTests() {
         super(ZulipActivity.class);
@@ -54,7 +54,7 @@ public void testMessageCreation() throws JSONException {
                 "[email protected]"));
     }
 
-    public void checkRanges(String rangestr) throws SQLException {
+    private void checkRanges(String rangestr) throws SQLException {
         List<MessageRange> ranges = app.getDao(MessageRange.class)
                 .queryBuilder().orderBy("low", true).query();
         String s = "";
@@ -214,7 +214,7 @@ public void testAGOMFetch() throws SQLException, InterruptedException,
 
     }
 
-    protected Message sampleMessage(ZulipApp app, int id) throws SQLException {
+    private Message sampleMessage(ZulipApp app, int id) throws SQLException {
         Message rtr = new Message(app);
         rtr.setSender(Person.getOrUpdate(app, "Test User",
                 TESTUSER_EXAMPLE_COM, ""));
@@ -230,7 +230,7 @@ protected Message sampleMessage(ZulipApp app, int id) throws SQLException {
      * Run this before each test to set up the activity.
      */
     @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-    protected void prepTests() {
+    private void prepTests() {
         setApplication(app);
         this.startActivity(new Intent(getInstrumentation().getTargetContext(),
                 ZulipActivity.class), null, null);

app/src/androidTest/java/com/zulip/android/test/mutated/FakeAsyncGetOldMessages.java

@@ -19,7 +19,7 @@ public class FakeAsyncGetOldMessages extends
     private boolean fmCalled;
     public List<Message> appendTheseMessages;
     public List<FakeAsyncGetOldMessages> recurseRequestsReceived;
-    public MessageListFragment myfragment;
+    private MessageListFragment myfragment;
 
     public FakeAsyncGetOldMessages(MessageListFragment fragment) {
         super(fragment);

app/src/main/java/com/zulip/android/ZulipApp.java

@@ -36,17 +36,17 @@
 import org.json.JSONException;
 
 public class ZulipApp extends Application {
-    public static final String API_KEY = "api_key";
-    public static final String EMAIL = "email";
+    private static final String API_KEY = "api_key";
+    private static final String EMAIL = "email";
     private static ZulipApp instance;
     private static final String USER_AGENT = "ZulipAndroid";
     private static final String DEFAULT_SERVER_URL = "https://api.zulip.com/";
     private Person you;
     private SharedPreferences settings;
     private String api_key;
     private int max_message_id;
-    DatabaseHelper databaseHelper;
-    Set<String> mutedTopics;
+    private DatabaseHelper databaseHelper;
+    private Set<String> mutedTopics;
     private static final String MUTED_TOPIC_KEY = "mutedTopics";
 
     /**
@@ -134,7 +134,7 @@ public int getAppVersion() {
         }
     }
 
-    public void afterLogin() {
+    private void afterLogin() {
         String email = settings.getString(EMAIL, null);
         setEmail(email);
         setupEmoji();
@@ -358,7 +358,7 @@ public static ZulipApp getInstance() {
         return instance;
     }
 
-    public static void setInstance(ZulipApp instance) {
+    private static void setInstance(ZulipApp instance) {
         ZulipApp.instance = instance;
     }
 

app/src/main/java/com/zulip/android/activities/LoginActivity.java

@@ -266,7 +266,7 @@ public void onTaskFailure(String result) {
         }
     }
 
-    protected void openLegal() {
+    private void openLegal() {
         Intent i = new Intent(this, LegalActivity.class);
         startActivityForResult(i, 0);
     }
@@ -301,7 +301,7 @@ public void onConnectionFailed(ConnectionResult result) {
         }
     }
 
-    public void setupGoogleSignIn() {
+    private void setupGoogleSignIn() {
         if (mGoogleApiClient == null) {
             GoogleSignInOptions googleSignInOptions = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
                     .requestEmail()

app/src/main/java/com/zulip/android/activities/MessageListFragment.java

@@ -73,21 +73,21 @@ public interface Listener {
 
     public ZulipApp app;
 
-    SparseArray<Message> messageIndex;
+    private SparseArray<Message> messageIndex;
     RecyclerMessageAdapter adapter;
-    boolean loadingMessages = true;
+    private boolean loadingMessages = true;
     // Whether we've loaded all available messages in that direction
-    boolean loadedToTop = false;
-    boolean loadedToBottom = false;
+    private boolean loadedToTop = false;
+    private boolean loadedToBottom = false;
 
-    List<Message> mutedMessages;
-    int firstMessageId = -1;
-    int lastMessageId = -1;
+    private List<Message> mutedMessages;
+    private int firstMessageId = -1;
+    private int lastMessageId = -1;
 
-    boolean paused = false;
-    boolean initialized = false;
-    List<Message> messageList;
     TextView emptyTextView;
+    private boolean paused = false;
+    private boolean initialized = false;
+    private List<Message> messageList;
 
     public MessageListFragment() {
         app = ZulipApp.get();
@@ -425,7 +425,7 @@ public void onMessageError(LoadPosition pos) {
         // successful
     }
 
-    public void loadMoreMessages(final LoadPosition pos) {
+    private void loadMoreMessages(final LoadPosition pos) {
         int above = 0;
         int below = 0;
         int around;
@@ -477,15 +477,15 @@ public void onTaskFailure(String result) {
         });
     }
 
-    public Boolean listHasMostRecent() {
+    private Boolean listHasMostRecent() {
         return lastMessageId == app.getMaxMessageId();
     }
 
-    public void selectMessage(final Message message) {
+    private void selectMessage(final Message message) {
         recyclerView.scrollToPosition(adapter.getItemIndex(message));
     }
 
-    public Message getMessageById(int id) {
+    private Message getMessageById(int id) {
         return this.messageIndex.get(id);
     }
 }