From 616c48b6c7cb028f734b1aaa9aa6606d0db5f255 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 10 Apr 2019 12:21:21 -0500
Subject: [PATCH] Refresh purchases on startup

---
 app/src/main/java/org/tasks/Tasks.java               |  3 +++
 .../java/org/tasks/preferences/BasicPreferences.java | 12 +-----------
 app/src/main/res/xml/preferences.xml                 |  4 ----
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/tasks/Tasks.java b/app/src/main/java/org/tasks/Tasks.java
index f65e3fae1..26bc0d663 100644
--- a/app/src/main/java/org/tasks/Tasks.java
+++ b/app/src/main/java/org/tasks/Tasks.java
@@ -11,6 +11,7 @@ import dagger.Lazy;
 import io.reactivex.Completable;
 import io.reactivex.schedulers.Schedulers;
 import javax.inject.Inject;
+import org.tasks.billing.BillingClient;
 import org.tasks.files.FileHelper;
 import org.tasks.injection.ApplicationComponent;
 import org.tasks.injection.ForApplication;
@@ -38,6 +39,7 @@ public class Tasks extends InjectingApplication {
   @Inject RefreshScheduler refreshScheduler;
   @Inject GeofenceApi geofenceApi;
   @Inject LocalBroadcastManager localBroadcastManager;
+  @Inject BillingClient billingClient;
 
   @Override
   public void onCreate() {
@@ -86,6 +88,7 @@ public class Tasks extends InjectingApplication {
     workManager.scheduleBackup();
     geofenceApi.registerAll();
     FileHelper.delete(context, preferences.getCacheDirectory());
+    billingClient.queryPurchases();
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/preferences/BasicPreferences.java b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
index d1099a8be..f13c75022 100644
--- a/app/src/main/java/org/tasks/preferences/BasicPreferences.java
+++ b/app/src/main/java/org/tasks/preferences/BasicPreferences.java
@@ -31,7 +31,6 @@ import org.tasks.activities.ColorPickerActivity.ColorPalette;
 import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.analytics.Tracking.Events;
-import org.tasks.billing.BillingClient;
 import org.tasks.billing.Inventory;
 import org.tasks.billing.PurchaseActivity;
 import org.tasks.dialogs.DialogBuilder;
@@ -72,7 +71,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
   @Inject DialogBuilder dialogBuilder;
   @Inject Locale locale;
   @Inject ThemeCache themeCache;
-  @Inject BillingClient billingClient;
   @Inject Inventory inventory;
   @Inject PlayServices playServices;
   @Inject Toaster toaster;
@@ -221,13 +219,6 @@ public class BasicPreferences extends InjectingPreferenceActivity
           });
     }
 
-    findPreference(R.string.refresh_purchases)
-        .setOnPreferenceClickListener(
-            preference -> {
-              billingClient.queryPurchases();
-              return false;
-            });
-
     requires(
         R.string.settings_localization,
         atLeastJellybeanMR1(),
@@ -242,8 +233,7 @@ public class BasicPreferences extends InjectingPreferenceActivity
           R.string.about,
           false,
           R.string.rate_tasks,
-          R.string.upgrade_to_pro,
-          R.string.refresh_purchases);
+          R.string.upgrade_to_pro);
       requires(R.string.privacy, false, R.string.p_collect_statistics);
     }
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8455d74f5..52e271cdf 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -148,10 +148,6 @@
       android:key="@string/upgrade_to_pro"
       android:title="@string/upgrade_to_pro"/>
 
-    <Preference
-      android:key="@string/refresh_purchases"
-      android:title="@string/refresh_purchases"/>
-
   </PreferenceCategory>
 
   <PreferenceCategory