Improve new version checks before running

Author: Stypox

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

@@ -170,8 +170,8 @@ protected void onCreate(final Bundle savedInstanceState) {
             NotificationWorker.initialize(this);
         }
         if (!UpdateSettingsFragment.wasUserAskedForConsent(this)
-                && ReleaseVersionUtil.INSTANCE.isReleaseApk()
-                && !App.getApp().isFirstRun()) {
+                && !App.getApp().isFirstRun()
+                && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
     }
@@ -183,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), false)) {
+        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);