[tor-commits] [tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed"

[gk@xxxxxxxxxxxxxx]

commit 8b78836cdad4d4b81f2b76c5ac4d62c42fda8049
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Fri Dec 14 19:59:33 2018 +0000

    Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed"
    
    This reverts commit 35d8c07dbf9a8f4e78a00513374d97267b90958c.
---
 .../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
index 93c325e451bd..ea9534bfd741 100644
--- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
+++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
@@ -43,9 +43,7 @@ import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoApplication;
 import org.mozilla.gecko.GeckoSharedPrefs;
-import org.mozilla.gecko.preferences.DistroSharedPrefsImport;
 import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.util.FileUtils;
 import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.HardwareUtils;
@@ -248,7 +246,6 @@ public class Distribution {
                         final String preferencesJSON = FileUtils.readStringFromFile(descFile);
                         data = new GeckoBundle(1);
                         data.putString("preferences", preferencesJSON);
-                        DistroSharedPrefsImport.importPreferences(distribution.context, distribution);
 
                     } catch (IOException e) {
                         Log.e(LOGTAG, "Error getting distribution descriptor file.", e);
@@ -501,13 +498,6 @@ public class Distribution {
 
         // We've done the work once; don't do it again.
         if (this.state == STATE_SET) {
-            // If this is a new version of the app, then copy the
-            // distribution files from the APK
-            if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) {
-                Log.i(LOGTAG, "Copying APK distribution file because the build ID changed.");
-                copyAndCheckAPKDistribution();
-            }
-
             // Note that we don't compute the distribution directory.
             // Call `ensureDistributionDir` if you need it.
             runReadyQueue();



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits