Remove ProviderInstaller.installIfNeeded

app/src/generic/java/org/tasks/gtasks/PlayServices.kt

@@ -1,7 +1,6 @@
 package org.tasks.gtasks
 
 import android.app.Activity
-import android.content.Context
 import com.todoroo.astrid.activity.MainActivity
 import io.reactivex.disposables.Disposable
 import io.reactivex.disposables.Disposables
@@ -23,6 +22,4 @@ class PlayServices @Inject constructor() {
     fun check(mainActivity: MainActivity?): Disposable {
         return Disposables.empty()
     }
-
-    fun updateSecurityProvider(context: Context?) {}
 }

app/src/googleplay/java/org/tasks/gtasks/PlayServices.kt

@@ -5,9 +5,6 @@ import android.content.Context
 import android.widget.Toast
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
-import com.google.android.gms.common.GooglePlayServicesRepairableException
-import com.google.android.gms.security.ProviderInstaller
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -78,16 +75,6 @@ class PlayServices @Inject constructor(
     private val result: Int
         get() = preferences.getInt(R.string.play_services_available, -1)
 
-    fun updateSecurityProvider(context: Context?) {
-        try {
-            ProviderInstaller.installIfNeeded(context)
-        } catch (e: GooglePlayServicesRepairableException) {
-            Timber.e(e)
-        } catch (e: GooglePlayServicesNotAvailableException) {
-            Timber.e(e)
-        }
-    }
-
     companion object {
         private const val REQUEST_RESOLUTION = 10000
     }

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

@@ -1,23 +1,11 @@
 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> {
-  void addAccount(
+  void addAccount(CaldavClient client, String url, String username, String password) {
-      PlayServices playServices,
-      Context context,
-      CaldavClient client,
-      String url,
-      String username,
-      String password) {
     run(
-        () -> {
+        () -> client.setForeground().forUrl(url, username, password).getHomeSet());
-          playServices.updateSecurityProvider(context);
-          return client.setForeground().forUrl(url, username, password).getHomeSet();
-        });
   }
 }

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

@@ -1,6 +1,5 @@
 package org.tasks.caldav;
 
-import android.content.Context;
 import android.os.Bundle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
@@ -8,17 +7,13 @@ import com.todoroo.astrid.helper.UUIDHelper;
 import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.data.CaldavAccount;
-import org.tasks.gtasks.PlayServices;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.ForApplication;
 import timber.log.Timber;
 
 public class CaldavAccountSettingsActivity extends BaseCaldavAccountSettingsActivity
     implements Toolbar.OnMenuItemClickListener {
 
-  @Inject @ForApplication Context context;
   @Inject CaldavClient client;
-  @Inject PlayServices playServices;
 
   private AddCaldavAccountViewModel addCaldavAccountViewModel;
   private UpdateCaldavAccountViewModel updateCaldavAccountViewModel;
@@ -76,7 +71,7 @@ public class CaldavAccountSettingsActivity extends BaseCaldavAccountSettingsActi
 
   @Override
   protected void addAccount(String url, String username, String password) {
-    addCaldavAccountViewModel.addAccount(playServices, context, client, url, username, password);
+    addCaldavAccountViewModel.addAccount(client, url, username, password);
   }
 
   @Override

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

@@ -1,24 +1,15 @@
 package org.tasks.etesync;
 
-import android.content.Context;
 import androidx.core.util.Pair;
 import com.etesync.journalmanager.UserInfoManager.UserInfo;
-import org.tasks.gtasks.PlayServices;
 import org.tasks.ui.CompletableViewModel;
 
 @SuppressWarnings("WeakerAccess")
 public class AddEteSyncAccountViewModel extends CompletableViewModel<Pair<UserInfo, String>> {
-  void addAccount(
+  void addAccount(EteSyncClient client, String url, String username, String password) {
-      PlayServices playServices,
-      Context context,
-      EteSyncClient client,
-      String url,
-      String username,
-      String password) {
     run(
         () -> {
           client.setForeground();
-          playServices.updateSecurityProvider(context);
           String token = client.forUrl(url, username, null, null).getToken(password);
           return Pair.create(client.forUrl(url, username, null, token).getUserInfo(), token);
         });

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

@@ -3,7 +3,6 @@ package org.tasks.etesync;
 import static com.todoroo.astrid.data.Task.NO_ID;
 import static org.tasks.Strings.isNullOrEmpty;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -23,9 +22,7 @@ import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.caldav.BaseCaldavAccountSettingsActivity;
 import org.tasks.data.CaldavAccount;
-import org.tasks.gtasks.PlayServices;
 import org.tasks.injection.ActivityComponent;
-import org.tasks.injection.ForApplication;
 import timber.log.Timber;
 
 public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsActivity
@@ -33,8 +30,6 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
 
   private static final int REQUEST_ENCRYPTION_PASSWORD = 10101;
 
-  @Inject @ForApplication Context context;
-  @Inject PlayServices playServices;
   @Inject EteSyncClient eteSyncClient;
 
   private AddEteSyncAccountViewModel addAccountViewModel;
@@ -141,7 +136,7 @@ public class EteSyncAccountSettingsActivity extends BaseCaldavAccountSettingsAct
 
   @Override
   protected void addAccount(String url, String username, String password) {
-    addAccountViewModel.addAccount(playServices, context, eteSyncClient, url, username, password);
+    addAccountViewModel.addAccount(eteSyncClient, url, username, password);
   }
 
   @Override