Merge pull request #10790 from TeamNewPipe/update-check-consent

Ask for consent before checking for updates

Author: Stypox

app/src/main/java/org/schabi/newpipe/App.java

@@ -60,6 +60,8 @@
 public class App extends Application {
     public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
     private static final String TAG = App.class.toString();
+
+    private boolean isFirstRun = false;
     private static App app;
 
     @NonNull
@@ -85,7 +87,13 @@ public void onCreate() {
             return;
         }
 
-        // Initialize settings first because others inits can use its values
+        // check if the last used preference version is set
+        // to determine whether this is the first app run
+        final int lastUsedPrefVersion = PreferenceManager.getDefaultSharedPreferences(this)
+                .getInt(getString(R.string.last_used_preferences_version), -1);
+        isFirstRun = lastUsedPrefVersion == -1;
+
+        // Initialize settings first because other initializations can use its values
         NewPipeSettings.initSettings(this);
 
         NewPipe.init(getDownloader(),
@@ -255,4 +263,7 @@ protected boolean isDisposedRxExceptionsReported() {
         return false;
     }
 
+    public boolean isFirstRun() {
+        return isFirstRun;
+    }
 }

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -79,13 +79,15 @@
 import org.schabi.newpipe.player.event.OnKeyDownListener;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.settings.UpdateSettingsFragment;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PeertubeHelper;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.ReleaseVersionUtil;
 import org.schabi.newpipe.util.SerializedCache;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
@@ -167,6 +169,11 @@ protected void onCreate(final Bundle savedInstanceState) {
             // if this is enabled by the user.
             NotificationWorker.initialize(this);
         }
+        if (!UpdateSettingsFragment.wasUserAskedForConsent(this)
+                && !App.getApp().isFirstRun()
+                && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
+            UpdateSettingsFragment.askForConsentToUpdateChecks(this);
+        }
     }
 
     @Override
@@ -176,7 +183,8 @@ protected void onPostCreate(final Bundle savedInstanceState) {
         final App app = App.getApp();
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
-        if (prefs.getBoolean(app.getString(R.string.update_app_key), true)) {
+        if (prefs.getBoolean(app.getString(R.string.update_app_key), false)
+                && prefs.getBoolean(app.getString(R.string.update_check_consent_key), false)) {
             // Start the worker which is checking all conditions
             // and eventually searching for a new version.
             NewVersionWorker.enqueueNewVersionCheckingWork(app, false);

app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java

@@ -11,6 +11,7 @@
 import androidx.annotation.StringRes;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.DeviceUtils;
 
@@ -44,14 +45,8 @@ public final class NewPipeSettings {
     private NewPipeSettings() { }
 
     public static void initSettings(final Context context) {
-        // check if the last used preference version is set
-        // to determine whether this is the first app run
-        final int lastUsedPrefVersion = PreferenceManager.getDefaultSharedPreferences(context)
-                .getInt(context.getString(R.string.last_used_preferences_version), -1);
-        final boolean isFirstRun = lastUsedPrefVersion == -1;
-
         // first run migrations, then setDefaultValues, since the latter requires the correct types
-        SettingMigrations.runMigrationsIfNeeded(context, isFirstRun);
+        SettingMigrations.runMigrationsIfNeeded(context);
 
         // readAgain is true so that if new settings are added their default value is set
         PreferenceManager.setDefaultValues(context, R.xml.main_settings, true);
@@ -68,7 +63,7 @@ public static void initSettings(final Context context) {
         saveDefaultVideoDownloadDirectory(context);
         saveDefaultAudioDownloadDirectory(context);
 
-        disableMediaTunnelingIfNecessary(context, isFirstRun);
+        disableMediaTunnelingIfNecessary(context);
     }
 
     static void saveDefaultVideoDownloadDirectory(final Context context) {
@@ -146,8 +141,7 @@ public static boolean showRemoteSearchSuggestions(final Context context,
                 R.string.show_remote_search_suggestions_key);
     }
 
-    private static void disableMediaTunnelingIfNecessary(@NonNull final Context context,
-                                                         final boolean isFirstRun) {
+    private static void disableMediaTunnelingIfNecessary(@NonNull final Context context) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final String disabledTunnelingKey = context.getString(R.string.disable_media_tunneling_key);
         final String disabledTunnelingAutomaticallyKey =
@@ -162,7 +156,7 @@ private static void disableMediaTunnelingIfNecessary(@NonNull final Context cont
                 prefs.getInt(disabledTunnelingAutomaticallyKey, -1) == 0
                         && !prefs.getBoolean(disabledTunnelingKey, false);
 
-        if (Boolean.TRUE.equals(isFirstRun)
+        if (App.getApp().isFirstRun()
                 || (wasDeviceBlacklistUpdated && !wasMediaTunnelingEnabledByUser)) {
             setMediaTunneling(context);
         }

app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java

@@ -7,6 +7,7 @@
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
@@ -163,15 +164,14 @@ protected void migrate(@NonNull final Context context) {
     private static final int VERSION = 6;
 
 
-    public static void runMigrationsIfNeeded(@NonNull final Context context,
-                                             final boolean isFirstRun) {
+    public static void runMigrationsIfNeeded(@NonNull final Context context) {
         // setup migrations and check if there is something to do
         sp = PreferenceManager.getDefaultSharedPreferences(context);
         final String lastPrefVersionKey = context.getString(R.string.last_used_preferences_version);
         final int lastPrefVersion = sp.getInt(lastPrefVersionKey, 0);
 
         // no migration to run, already up to date
-        if (isFirstRun) {
+        if (App.getApp().isFirstRun()) {
             sp.edit().putInt(lastPrefVersionKey, VERSION).apply();
             return;
         } else if (lastPrefVersion == VERSION) {

app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java

@@ -1,9 +1,12 @@
 package org.schabi.newpipe.settings;
 
+import android.app.AlertDialog;
+import android.content.Context;
 import android.os.Bundle;
 import android.widget.Toast;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
 
 import org.schabi.newpipe.NewVersionWorker;
 import org.schabi.newpipe.R;
@@ -36,4 +39,38 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         findPreference(getString(R.string.manual_update_key))
                 .setOnPreferenceClickListener(manualUpdateClick);
     }
+
+    public static void askForConsentToUpdateChecks(final Context context) {
+        new AlertDialog.Builder(context)
+                .setTitle(context.getString(R.string.check_for_updates))
+                .setMessage(context.getString(R.string.auto_update_check_description))
+                .setPositiveButton(context.getString(R.string.yes), (d, w) -> {
+                    d.dismiss();
+                    setAutoUpdateCheckEnabled(context, true);
+                })
+                .setNegativeButton(R.string.no, (d, w) -> {
+                    d.dismiss();
+                    // set explicitly to false, since the default is true on previous versions
+                    setAutoUpdateCheckEnabled(context, false);
+                })
+                .show();
+    }
+
+    private static void setAutoUpdateCheckEnabled(final Context context, final boolean enabled) {
+        PreferenceManager.getDefaultSharedPreferences(context)
+                .edit()
+                .putBoolean(context.getString(R.string.update_app_key), enabled)
+                .putBoolean(context.getString(R.string.update_check_consent_key), true)
+                .apply();
+    }
+
+    /**
+     * Whether the user was asked for consent to automatically check for app updates.
+     * @param context
+     * @return true if the user was asked for consent, false otherwise
+     */
+    public static boolean wasUserAskedForConsent(final Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(context.getString(R.string.update_check_consent_key), false);
+    }
 }

app/src/main/res/values-ar-rLY/strings.xml

@@ -78,7 +78,7 @@
     <string name="short_billion">بليون</string>
     <string name="feed_load_error_account_info">تعذر تحميل موجز \'%s\'.</string>
     <string name="question_mark">؟</string>
-    <string name="manual_update_title">التحقق من وجود تحديثات</string>
+    <string name="check_for_updates">التحقق من وجود تحديثات</string>
     <string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
     <string name="more_than_100_videos">+100 فيديو</string>
     <string name="short_thousand">ألف</string>

app/src/main/res/values-ar/strings.xml

@@ -700,7 +700,7 @@
     <string name="enqueue_next_stream">وضع التالي على قائمة الانتظار</string>
     <string name="enqueued_next">تم وضع التالي على قائمة الانتظار</string>
     <string name="processing_may_take_a_moment">جاري المعالجة ... قد يستغرق لحظة</string>
-    <string name="manual_update_title">التحقق من وجود تحديثات</string>
+    <string name="check_for_updates">التحقق من وجود تحديثات</string>
     <string name="manual_update_description">التحقق يدويا من وجود إصدارات جديدة</string>
     <string name="checking_updates_toast">جاري التحقق من وجود تحديثات…</string>
     <string name="feed_new_items">عناصر تغذية جديدة</string>

app/src/main/res/values-az/strings.xml

@@ -448,7 +448,7 @@
         <item quantity="one">%s video</item>
         <item quantity="other">%s video</item>
     </plurals>
-    <string name="manual_update_title">Yeniləmələri yoxla</string>
+    <string name="check_for_updates">Yeniləmələri yoxla</string>
     <string name="seekbar_preview_thumbnail_title">Axtarış çubuğunun miniatür önizləməsi</string>
     <string name="permission_denied">Əməliyyat sistem tərəfindən ləğv edildi</string>
     <string name="auto">Avto</string>

app/src/main/res/values-be/strings.xml

@@ -670,7 +670,7 @@
     <string name="enable_streams_notifications_summary">Апавяшчаць аб новых стрымах з падпісак</string>
     <string name="streams_notifications_interval_title">Частата праверкі</string>
     <string name="streams_notifications_network_title">Патрабуецца падключэнне да сеткі</string>
-    <string name="manual_update_title">Праверце наяўнасць абнаўленняў</string>
+    <string name="check_for_updates">Праверце наяўнасць абнаўленняў</string>
     <string name="manual_update_description">Праверце новыя версіі ўручную</string>
     <string name="autoplay_summary">Аўтаматычны запуск прайгравання — %s</string>
     <string name="card">Картка</string>

app/src/main/res/values-bg/strings.xml

@@ -548,7 +548,7 @@
     <string name="recaptcha_cookies_cleared">Бисквитките от reCAPTCHA бяха почистени</string>
     <string name="checking_updates_toast">Проверяване за актуализации…</string>
     <string name="enumeration_comma">,</string>
-    <string name="manual_update_title">Провери за актуализации</string>
+    <string name="check_for_updates">Провери за актуализации</string>
     <string name="percent">Процент</string>
     <string name="unknown_quality">Неизвестно качество</string>
     <string name="unknown_format">Неизвестен формат</string>