Rearrange some files

app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java

@@ -1,4 +1,4 @@
-package org.tasks.caldav;
+package org.tasks.activities;
 
 import static org.tasks.dialogs.IconPickerDialog.newIconPicker;
 
@@ -18,7 +18,6 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.activities.ColorPickerActivity;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.dialogs.IconPickerDialog.IconPickerCallback;
 import org.tasks.injection.ThemedInjectingAppCompatActivity;

app/src/main/java/org/tasks/activities/FilterSettingsActivity.java

@@ -21,7 +21,6 @@ import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.CustomFilter;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.caldav.BaseListSettingsActivity;
 import org.tasks.data.FilterDao;
 import org.tasks.injection.ActivityComponent;
 

app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java

@@ -21,7 +21,6 @@ import com.todoroo.astrid.gtasks.api.GtasksInvoker;
 import com.todoroo.astrid.service.TaskDeleter;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.caldav.BaseListSettingsActivity;
 import org.tasks.data.GoogleTaskAccount;
 import org.tasks.data.GoogleTaskList;
 import org.tasks.data.GoogleTaskListDao;

app/src/main/java/org/tasks/activities/TagSettingsActivity.java

@@ -22,7 +22,6 @@ import com.todoroo.astrid.api.TagFilter;
 import com.todoroo.astrid.helper.UUIDHelper;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.caldav.BaseListSettingsActivity;
 import org.tasks.data.TagDao;
 import org.tasks.data.TagData;
 import org.tasks.data.TagDataDao;

app/src/main/java/org/tasks/caldav/AddCaldavAccountViewModel.java

@@ -1,12 +1,13 @@
-package org.tasks.activities;
+package org.tasks.caldav;
 
 import android.content.Context;
 import org.tasks.caldav.CaldavClient;
 import org.tasks.gtasks.PlayServices;
 import org.tasks.ui.CompletableViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class AddCaldavAccountViewModel extends CompletableViewModel<String> {
-  public void addAccount(
+  void addAccount(
       PlayServices playServices,
       Context context,
       CaldavClient client,

app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.java

@@ -24,6 +24,7 @@ import com.todoroo.astrid.service.TaskDeleter;
 import java.net.ConnectException;
 import javax.inject.Inject;
 import org.tasks.R;
+import org.tasks.activities.BaseListSettingsActivity;
 import org.tasks.data.CaldavAccount;
 import org.tasks.data.CaldavCalendar;
 import org.tasks.data.CaldavDao;

app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java

@@ -6,8 +6,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProviders;
 import com.todoroo.astrid.helper.UUIDHelper;
 import javax.inject.Inject;
-import org.tasks.activities.AddCaldavAccountViewModel;
-import org.tasks.activities.UpdateCaldavAccountViewModel;
 import org.tasks.analytics.Tracking.Events;
 import org.tasks.data.CaldavAccount;
 import org.tasks.gtasks.PlayServices;

app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java

@@ -4,8 +4,6 @@ import android.os.Bundle;
 import androidx.lifecycle.ViewModelProviders;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.activities.CreateCalendarViewModel;
-import org.tasks.activities.DeleteCalendarViewModel;
 import org.tasks.data.CaldavAccount;
 import org.tasks.data.CaldavCalendar;
 import org.tasks.injection.ActivityComponent;

app/src/main/java/org/tasks/caldav/CreateCalendarViewModel.java

@@ -1,11 +1,11 @@
-package org.tasks.activities;
+package org.tasks.caldav;
 
-import org.tasks.caldav.CaldavClient;
 import org.tasks.data.CaldavAccount;
 import org.tasks.ui.CompletableViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class CreateCalendarViewModel extends CompletableViewModel<String> {
-  public void createCalendar(CaldavClient client, CaldavAccount account, String name) {
+  void createCalendar(CaldavClient client, CaldavAccount account, String name) {
     run(() -> client.forAccount(account).makeCollection(name));
   }
 }

app/src/main/java/org/tasks/caldav/DeleteCalendarViewModel.java

@@ -1,12 +1,12 @@
-package org.tasks.activities;
+package org.tasks.caldav;
 
-import org.tasks.caldav.CaldavClient;
 import org.tasks.data.CaldavAccount;
 import org.tasks.data.CaldavCalendar;
 import org.tasks.ui.ActionViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class DeleteCalendarViewModel extends ActionViewModel {
-  public void deleteCalendar(CaldavClient client, CaldavAccount account, CaldavCalendar calendar) {
+  void deleteCalendar(CaldavClient client, CaldavAccount account, CaldavCalendar calendar) {
     run(() -> client.forCalendar(account, calendar).deleteCollection());
   }
 }

app/src/main/java/org/tasks/caldav/UpdateCaldavAccountViewModel.java

@@ -1,10 +1,10 @@
-package org.tasks.activities;
+package org.tasks.caldav;
 
-import org.tasks.caldav.CaldavClient;
 import org.tasks.ui.CompletableViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class UpdateCaldavAccountViewModel extends CompletableViewModel<String> {
-  public void updateCaldavAccount(
+  void updateCaldavAccount(
       CaldavClient client, String url, String username, String password) {
     run(() -> client.forUrl(url, username, password).getHomeSet());
   }

app/src/main/java/org/tasks/etesync/AddEteSyncAccountViewModel.java

@@ -1,4 +1,4 @@
-package org.tasks.activities;
+package org.tasks.etesync;
 
 import android.content.Context;
 import androidx.core.util.Pair;
@@ -7,9 +7,10 @@ import org.tasks.etesync.EteSyncClient;
 import org.tasks.gtasks.PlayServices;
 import org.tasks.ui.CompletableViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class AddEteSyncAccountViewModel
     extends CompletableViewModel<Pair<String, String>> {
-  public void addAccount(
+  void addAccount(
       PlayServices playServices,
       Context context,
       EteSyncClient client,

app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.java

@@ -14,8 +14,6 @@ import io.reactivex.Completable;
 import io.reactivex.schedulers.Schedulers;
 import javax.inject.Inject;
 import org.tasks.R;
-import org.tasks.activities.AddEteSyncAccountViewModel;
-import org.tasks.activities.UpdateEteSyncAccountViewModel;
 import org.tasks.analytics.Tracking.Events;
 import org.tasks.caldav.BaseCaldavAccountSettingsActivity;
 import org.tasks.data.CaldavAccount;
@@ -102,8 +100,8 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
 
   @Override
   protected void updateAccount(String url, String username, String password) {
-    updateAccountViewModel.addAccount(
+    updateAccountViewModel.updateAccount(
-        context, eteSyncClient, url, username, password, getNewEncryptionPassword());
+        eteSyncClient, url, username, password, getNewEncryptionPassword());
   }
 
   @Override

app/src/main/java/org/tasks/etesync/EteSyncClient.java

@@ -136,7 +136,7 @@ public class EteSyncClient {
         account.getPassword(encryption));
   }
 
-  public EteSyncClient forUrl(String url, String username, String encryptionPassword, String token)
+  EteSyncClient forUrl(String url, String username, String encryptionPassword, String token)
       throws KeyManagementException, NoSuchAlgorithmException {
     return new EteSyncClient(
         context,
@@ -150,7 +150,7 @@ public class EteSyncClient {
         foreground);
   }
 
-  public Pair<String, String> getKeyAndToken(String password)
+  Pair<String, String> getKeyAndToken(String password)
       throws IOException, Exceptions.HttpException, VersionTooNewException, IntegrityException {
     JournalAuthenticator journalAuthenticator = new JournalAuthenticator(httpClient, httpUrl);
     String token = journalAuthenticator.getAuthToken(username, password);
@@ -214,7 +214,7 @@ public class EteSyncClient {
     }
   }
 
-  public EteSyncClient setForeground() {
+  EteSyncClient setForeground() {
     foreground = true;
     return this;
   }

app/src/main/java/org/tasks/etesync/UpdateEteSyncAccountViewModel.java

@@ -1,13 +1,11 @@
-package org.tasks.activities;
+package org.tasks.etesync;
 
-import android.content.Context;
 import androidx.core.util.Pair;
-import org.tasks.etesync.EteSyncClient;
 import org.tasks.ui.CompletableViewModel;
 
+@SuppressWarnings("WeakerAccess")
 public class UpdateEteSyncAccountViewModel extends CompletableViewModel<Pair<String, String>> {
-  public void addAccount(
+  void updateAccount(
-      Context context,
       EteSyncClient client,
       String url,
       String username,