Use ContextUtils in PhysicalWeb

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ skipping 85 matching lines @@
          * @param urls A set of UrlInfos containing nearby URLs resolvable with our resolution
          * service.
          */
         void onDisplayableUrlsAdded(Collection<UrlInfo> urls);
     }
 
     /**
      * Construct the UrlManager.
      * @param context An instance of android.content.Context
      */
+    @VisibleForTesting
     public UrlManager(Context context) {
         mContext = context;
         mNotificationManager = new NotificationManagerProxyImpl(
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE));
         mPwsClient = new PwsClientImpl(context);
         mObservers = new ObserverList<Listener>();
         mNearbyUrls = new HashSet<>();
         mResolvedUrls = new HashSet<>();
         mUrlInfoMap = new HashMap<>();
         mUrlsSortedByTimestamp = new PriorityQueue<String>(1, mScanTimestampComparator);
         initSharedPreferences();
     }
 
     /**
      * Get a singleton instance of this class.
-     * @param context An instance of android.content.Context.
+     * @return A singleton instance of this class.
+     */
+    public static UrlManager getInstance() {
+        if (sInstance == null) {
+            sInstance = new UrlManager(ContextUtils.getApplicationContext());
+        }
+        return sInstance;
+    }
+
+    /**
+     * Get a singleton instance of this class.
+     * @param context unused
      * @return A singleton instance of this class.
      */
     public static UrlManager getInstance(Context context) {

[mattreynolds, 2016/06/29 00:48:10]

When can this be removed?

[cco3, 2016/06/29 16:36:00]

When downstream code stops relying on it. (i.e. in the not-too-distant-future)

-        if (sInstance == null) {
-            sInstance = new UrlManager(context);
-        }
-        return sInstance;
+        return getInstance();
     }
 
     /**
      * Add an observer to be notified on changes to the nearby URL list.
      * @param observer The observer to add.
      */
     public void addObserver(Listener observer) {
         mObservers.addObserver(observer);
     }
 
@@ skipping 20 matching lines @@
         recordUpdate();
         if (mNearbyUrls.contains(urlInfo.getUrl())
                 // In the rare event that our entry is immediately garbage collected from the cache,
                 // we should stop here.
                 || !mUrlInfoMap.containsKey(urlInfo.getUrl())) {
             return;
         }
         mNearbyUrls.add(urlInfo.getUrl());
         putCachedNearbyUrls();
 
-        if (!PhysicalWeb.isOnboarding(mContext) && !mResolvedUrls.contains(urlInfo.getUrl())) {
+        if (!PhysicalWeb.isOnboarding() && !mResolvedUrls.contains(urlInfo.getUrl())) {
             // We need to resolve the URL.
             resolveUrl(urlInfo);
             return;
         }
         registerNewDisplayableUrl(urlInfo);
     }
 
     /**
      * Add a URL to the store of URLs.
      */
     // TODO(conleyo) we should remove this method after calling code only passes us a UrlInfo.
     @VisibleForTesting
     public void addUrl(String url) {
         addUrl(new UrlInfo(url, -1.0, System.currentTimeMillis()));
     }
 
     /**
      * Remove a URL to the store of URLs.
      * This method additionally updates the Physical Web notification.
      * @param urlInfo The URL to remove.
      */
     @VisibleForTesting
     public void removeUrl(UrlInfo urlInfo) {
         Log.d(TAG, "URL lost: %s", urlInfo);
         recordUpdate();
         mNearbyUrls.remove(urlInfo.getUrl());
         putCachedNearbyUrls();
 
         // If there are no URLs nearby to display, clear the notification.
-        if (getUrls(PhysicalWeb.isOnboarding(mContext)).isEmpty()) {
+        if (getUrls(PhysicalWeb.isOnboarding()).isEmpty()) {
             clearNotification();
         }
     }
 
     /**
      * Remove a URL to the store of URLs.
      */
     // TODO(conleyo) we should remove this method after calling code only passes us a UrlInfo.
     @VisibleForTesting
     public void removeUrl(String url) {
@@ skipping 103 matching lines @@
         }
         registerNewDisplayableUrl(urlInfo);
     }
 
     private void removeResolvedUrl(UrlInfo url) {
         Log.d(TAG, "PWS unresolved: %s", url);
         mResolvedUrls.remove(url.getUrl());
         putCachedResolvedUrls();
 
         // If there are no URLs nearby to display, clear the notification.
-        if (getUrls(PhysicalWeb.isOnboarding(mContext)).isEmpty()) {
+        if (getUrls(PhysicalWeb.isOnboarding()).isEmpty()) {
             clearNotification();
         }
     }
 
     private void initSharedPreferences() {
         // Check the version.
         final SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
         if (prefs.getInt(PREFS_VERSION_KEY, 0) != PREFS_VERSION) {
             new AsyncTask<Void, Void, Void>() {
                 @Override
@@ skipping 140 matching lines @@
 
     private void showNotification() {
         // We should only show notifications if there's no other notification-based client.
         if (!PhysicalWeb.shouldIgnoreOtherClients()
                 && PhysicalWebEnvironment
                         .getInstance((ChromeApplication) mContext.getApplicationContext())
                         .hasNotificationBasedClient()) {
             return;
         }
 
-        if (PhysicalWeb.isOnboarding(mContext)) {
-            if (PhysicalWeb.getOptInNotifyCount(mContext) < PhysicalWeb.OPTIN_NOTIFY_MAX_TRIES) {
+        if (PhysicalWeb.isOnboarding()) {
+            if (PhysicalWeb.getOptInNotifyCount() < PhysicalWeb.OPTIN_NOTIFY_MAX_TRIES) {
                 // high priority notification
                 createOptInNotification(true);
-                PhysicalWeb.recordOptInNotification(mContext);
+                PhysicalWeb.recordOptInNotification();
                 PhysicalWebUma.onOptInHighPriorityNotificationShown(mContext);
             } else {
                 // min priority notification
                 createOptInNotification(false);
                 PhysicalWebUma.onOptInMinPriorityNotificationShown(mContext);
             }
-        } else if (PhysicalWeb.isPhysicalWebPreferenceEnabled(mContext)) {
+        } else if (PhysicalWeb.isPhysicalWebPreferenceEnabled()) {
             createNotification();
         }
     }
 
     private void createNotification() {
         PendingIntent pendingIntent = createListUrlsIntent();
 
         // Get values to display.
         Resources resources = mContext.getResources();
         String title = resources.getString(R.string.physical_web_notification_title);
@@ skipping 65 matching lines @@
         Collection<UrlInfo> urlInfos = new ArrayList<>();
         urlInfos.add(urlInfo);
         Collection<UrlInfo> wrappedUrlInfos = Collections.unmodifiableCollection(urlInfos);
         for (Listener observer : mObservers) {
             observer.onDisplayableUrlsAdded(wrappedUrlInfos);
         }
 
         // Only trigger the notification if we know we didn't have a notification up already
         // (i.e., we have exactly 1 displayble URL) or this URL doesn't exist in the cache
         // (and hence the user hasn't swiped away a notification for this URL recently).
-        if (getUrls(PhysicalWeb.isOnboarding(mContext)).size() != 1
+        if (getUrls(PhysicalWeb.isOnboarding()).size() != 1
                 && urlInfo.hasBeenDisplayed()) {
             return;
         }
 
         // Show a notification and mark the URL as displayed.
         showNotification();
         urlInfo.setHasBeenDisplayed();
     }
 
     private void garbageCollect() {
@@ skipping 52 matching lines @@
                 || mResolvedUrls.contains(url)
                 || mUrlInfoMap.containsKey(url)
                 || mUrlsSortedByTimestamp.contains(url);
     }
 
     @VisibleForTesting
     int getMaxCacheSize() {
         return MAX_CACHE_SIZE;
     }
 }