Store URLs in WebappDataStorage, and purge them when history is cleared.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.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.webapps;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
@@ skipping 13 matching lines @@
  * (1) UPDATING/RETRIEVING THE ICON (web app MUST have been registered in WebappRegistry)
  * WebappDataStorage storage = WebappDataStorage.open(context, id);
  * storage.updateSplashScreenImage(bitmap);
  * storage.getSplashScreenImage(callback);
  */
 public class WebappDataStorage {
 
     static final String SHARED_PREFS_FILE_PREFIX = "webapp_";
     static final String KEY_SPLASH_ICON = "splash_icon";
     static final String KEY_LAST_USED = "last_used";
+    static final String KEY_ORIGIN_URL = "origin_url";
+
+    // Null/invalid constants for last used times and origins. 0 is used as the null last used time
+    // as WebappRegistry assumes that this is always a valid timestamp.
+    static final long NULL_LAST_USED = 0;
     static final long INVALID_LAST_USED = -1;
+    static final String INVALID_ORIGIN_URL = "";
 
     private static Factory sFactory = new Factory();
 
     private final SharedPreferences mPreferences;
 
     /**
      * Opens an instance of WebappDataStorage for the web app specified.
      * @param context  The context to open the SharedPreferences.
      * @param webappId The ID of the web app which is being opened.
      */
     public static WebappDataStorage open(final Context context, final String webappId) {
         final WebappDataStorage storage = sFactory.create(context, webappId);
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected final Void doInBackground(Void... nothing) {
-                if (storage.getLastUsedTime() == INVALID_LAST_USED) {
-                    // If the last used time is invalid then assert that there is no data
-                    // in the WebappDataStorage which needs to be cleaned up.
-                    assert storage.getAllData().isEmpty();
-                } else {
-                    storage.updateLastUsedTime();
-                }
+                // The last used time may be invalid if the user has cleared their history.

[gone, 2016/03/08 22:40:39]

Given that you're using two different values for INVALID and NULL, can you put
the assert back?

+                // The next time the webapp is opened, set it to a valid value again.
+                storage.updateLastUsedTime(System.currentTimeMillis());
                 return null;
             }
         }.execute();
         return storage;
     }
 
     /**
      * Asynchronously retrieves the time which this WebappDataStorage was last
      * opened using {@link WebappDataStorage#open(Context, String)}.
      * @param context  The context to read the SharedPreferences file.
      * @param webappId The ID of the web app the used time is being read for.
      * @param callback Called when the last used time has been retrieved.
      */
+    @VisibleForTesting
     public static void getLastUsedTime(final Context context, final String webappId,
             final FetchCallback<Long> callback) {
         new AsyncTask<Void, Void, Long>() {
             @Override
             protected final Long doInBackground(Void... nothing) {
                 long lastUsed = new WebappDataStorage(context.getApplicationContext(), webappId)
                         .getLastUsedTime();
                 assert lastUsed != INVALID_LAST_USED;
                 return lastUsed;
             }
 
             @Override
             protected final void onPostExecute(Long lastUsed) {
                 callback.onDataRetrieved(lastUsed);
             }
         }.execute();
     }
 
     /**
+     * Asynchronously retrieves the origin URL stored in this WebappDataStorage.
+     * @param context  The context to read the SharedPreferences file.
+     * @param webappId The ID of the web app the used time is being read for.
+     * @param callback Called when the origin has been retrieved.
+     */
+    @VisibleForTesting

[gone, 2016/03/08 22:40:39]

Venting, no action items here:
For the record, this Class makes me weep whenever I see it.  It's an
over-engineered mess for the one (now two) things it does.

See my comments on
https://chromiumcodereview.appspot.com/1286973003/diff/100001/chrome/android/...

[dominickn, 2016/03/09 08:18:32]

Definitely, definitely agreed.

+    public static void getOriginUrl(final Context context, final String webappId,
+            final FetchCallback<String> callback) {
+        new AsyncTask<Void, Void, String>() {
+            @Override
+            protected final String doInBackground(Void... nothing) {
+                String originUrl = new WebappDataStorage(context.getApplicationContext(), webappId)
+                        .getOriginUrl();
+                return originUrl;
+            }
+
+            @Override
+            protected final void onPostExecute(String originUrl) {
+                callback.onDataRetrieved(originUrl);
+            }
+        }.execute();
+    }
+
+    /**
+     * Asynchronously updates the origin URL stored in this WebappDataStorage.
+     * @param context  The context to read the SharedPreferences file.
+     * @param webappId The ID of the web app the used time is being read for.
+     * @param origin The origin to set for the web app.
+     */
+    public static void updateOriginUrl(final Context context, final String webappId,
+            final String originUrl) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected final Void doInBackground(Void... nothing) {
+                new WebappDataStorage(context.getApplicationContext(), webappId)
+                        .updateOriginUrl(originUrl);
+                return null;
+            }
+        }.execute();
+    }
+
+    /**
      * Deletes the data for a web app by clearing all the information inside the SharedPreferences
      * file. This does NOT delete the file itself but the file is left empty.
      * @param context  The context to read the SharedPreferences file.
      * @param webappId The ID of the web app being deleted.
      */
     static void deleteDataForWebapp(final Context context, final String webappId) {
         assert !ThreadUtils.runningOnUiThread();
         openSharedPreferences(context, webappId).edit().clear().apply();
     }
 
     /**
+     * Deletes the origin URL and sets last used time to 0 this web app in SharedPreferences.
+     * This does not remove the stored splash screen image (if any) for the app.
+     * @param context  The context to read the SharedPreferences file.
+     * @param webappId The ID of the web app being deleted.
+     */
+    static void clearHistory(final Context context, final String webappId) {
+        // The last used time is set to 0 to ensure that a valid value is always present.
+        // If the webapp is not launched prior to the next cleanup, then its remaining data will be
+        // removed. Otherwise, the next launch will update the last used time.
+        assert !ThreadUtils.runningOnUiThread();
+        openSharedPreferences(context, webappId)
+            .edit().putLong(KEY_LAST_USED, NULL_LAST_USED).remove(KEY_ORIGIN_URL).apply();

[gone, 2016/03/08 22:40:39]

nit: indent by 8

[dominickn, 2016/03/09 08:18:32]

Done.

+    }
+
+    /**
      * Sets the factory used to generate WebappDataStorage objects.
      */
     @VisibleForTesting
     public static void setFactoryForTests(Factory factory) {
         sFactory = factory;
     }
 
     private static SharedPreferences openSharedPreferences(Context context, String webappId) {
         return context.getApplicationContext().getSharedPreferences(
                 SHARED_PREFS_FILE_PREFIX + webappId, Context.MODE_PRIVATE);
@@ skipping 14 matching lines @@
     }
 
     /*
      * Update the information associated with the web app with the specified data.
      * @param splashScreenImage The image which should be shown on the splash screen of the web app.
      */
     public void updateSplashScreenImage(Bitmap splashScreenImage) {
         new UpdateTask(splashScreenImage).execute();
     }
 
-    void updateLastUsedTime() {
+    void updateOriginUrl(String originUrl) {

[gone, 2016/03/08 22:40:39]

Add javadocs to these

[dominickn, 2016/03/09 08:18:32]

Done.

         assert !ThreadUtils.runningOnUiThread();
-        mPreferences.edit().putLong(KEY_LAST_USED, System.currentTimeMillis()).apply();
+        mPreferences.edit().putString(KEY_ORIGIN_URL, originUrl).apply();
+    }
+
+    String getOriginUrl() {
+        assert !ThreadUtils.runningOnUiThread();
+        return mPreferences.getString(KEY_ORIGIN_URL, INVALID_ORIGIN_URL);
+    }
+
+    void updateLastUsedTime(long lastUsedTime) {
+        assert !ThreadUtils.runningOnUiThread();
+        mPreferences.edit().putLong(KEY_LAST_USED, lastUsedTime).apply();
     }
 
     long getLastUsedTime() {
         assert !ThreadUtils.runningOnUiThread();
         return mPreferences.getLong(KEY_LAST_USED, INVALID_LAST_USED);
     }
 
     private Map<String, ?> getAllData() {
         return mPreferences.getAll();
     }
@@ skipping 13 matching lines @@
     public static class Factory {
 
         /**
          * Generates a WebappDataStorage class for a specified web app.
          */
         public WebappDataStorage create(final Context context, final String webappId) {
             return new WebappDataStorage(context, webappId);
         }
     }
 
     private final class BitmapFetchTask extends AsyncTask<Void, Void, Bitmap> {

[gone, 2016/03/10 23:27:21]

So much \o/.

[dominickn, 2016/03/11 05:14:42]

\o/ \o/

 
         private final String mKey;
         private final FetchCallback<Bitmap> mCallback;
 
         public BitmapFetchTask(String key, FetchCallback<Bitmap> callback) {
             mKey = key;
             mCallback = callback;
         }
 
         @Override
@@ skipping 16 matching lines @@
         }
 
         @Override
         protected Void doInBackground(Void... nothing) {
             mPreferences.edit()
                     .putString(KEY_SPLASH_ICON, ShortcutHelper.encodeBitmapAsString(mSplashImage))
                     .apply();
             return null;
         }
     }
-}
+}