Bug 1273689 - Factor out getSharedPreferences call. r=sebastian draft
authorMichael Comella <michael.l.comella@gmail.com>
Tue, 31 May 2016 14:07:26 -0700
changeset 373606 8824624c524392c0178535c47bf9657ba9cf9168
parent 373605 0e13c316b6fc4a5522a52f75c5f00ffd54a7baab
child 373607 ad7f650414c15ac44b64acb371a04f3cfea3d0e2
push id19788
push usermichael.l.comella@gmail.com
push dateTue, 31 May 2016 22:41:35 +0000
reviewerssebastian
bugs1273689
milestone49.0a1
Bug 1273689 - Factor out getSharedPreferences call. r=sebastian The same preferences will be used by the new code & the old code. MozReview-Commit-ID: BXuSQjhhXQq
mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingUploadDelegate.java
--- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingUploadDelegate.java
+++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingUploadDelegate.java
@@ -53,16 +53,20 @@ public class TelemetryCorePingUploadDele
     private TelemetryDispatcher getTelemetryDispatcher(final BrowserApp browserApp) {
         if (telemetryDispatcher == null) {
             final String profilePath = browserApp.getProfile().getDir().getAbsolutePath();
             telemetryDispatcher = new TelemetryDispatcher(profilePath);
         }
         return telemetryDispatcher;
     }
 
+    private SharedPreferences getSharedPreferences(final BrowserApp activity) {
+        return GeckoSharedPrefs.forProfileName(activity, activity.getProfile().getName());
+    }
+
     private class UploadTelemetryCorePingCallback implements SearchEngineManager.SearchEngineCallback {
         private final WeakReference<BrowserApp> activityWeakReference;
 
         private UploadTelemetryCorePingCallback(final BrowserApp activity) {
             this.activityWeakReference = new WeakReference<>(activity);
         }
 
         // May be called from any thread.
@@ -96,17 +100,17 @@ public class TelemetryCorePingUploadDele
                     try {
                         clientID = profile.getClientId();
                     } catch (final IOException e) {
                         Log.w(LOGTAG, "Unable to get client ID to generate core ping: " + e);
                         return;
                     }
 
                     // Each profile can have different telemetry data so we intentionally grab the shared prefs for the profile.
-                    final SharedPreferences sharedPrefs = GeckoSharedPrefs.forProfileName(activity, profile.getName());
+                    final SharedPreferences sharedPrefs = getSharedPreferences(activity);
                     final SessionMeasurements.SessionMeasurementsContainer sessionMeasurementsContainer =
                             activity.getSessionMeasurementDelegate().getAndResetSessionMeasurements(activity);
                     final TelemetryCorePingBuilder pingBuilder = new TelemetryCorePingBuilder(activity)
                             .setClientID(clientID)
                             .setDefaultSearchEngine(TelemetryCorePingBuilder.getEngineIdentifier(engine))
                             .setProfileCreationDate(TelemetryCorePingBuilder.getProfileCreationDate(activity, profile))
                             .setSequenceNumber(TelemetryCorePingBuilder.getAndIncrementSequenceNumber(sharedPrefs))
                             .setSessionCount(sessionMeasurementsContainer.sessionCount)