Issue 6032 - Page not added to the Reading List

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/SafeIntent.java

 /*
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 // This should be in util/, but is here because of build dependency issues.
 package org.mozilla.gecko.mozglue;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 
 import java.util.ArrayList;
 
 /**
  * External applications can pass values into Intents that can cause us to crash: in defense,
  * we wrap {@link Intent} and catch the exceptions they may force us to throw. See bug 1090385
  * for more.
  */
 public class SafeIntent {
     private static final String LOGTAG = "Gecko" + SafeIntent.class.getSimpleName();
 
     private final Intent intent;
 
     public SafeIntent(final Intent intent) {
+        stripDataUri(intent);
         this.intent = intent;
     }
 
     public boolean hasExtra(String name) {
         try {
             return intent.hasExtra(name);
         } catch (OutOfMemoryError e) {
             Log.w(LOGTAG, "Couldn't determine if intent had an extra: OOM. Malformed?");
             return false;
         } catch (RuntimeException e) {
@@ skipping 86 matching lines @@
             return null;
         } catch (RuntimeException e) {
             Log.w(LOGTAG, "Couldn't get intent data.", e);
             return null;
         }
     }
 
     public Intent getUnsafe() {
         return intent;
     }
+
+    private static void stripDataUri(final Intent intent) {
+        // We should limit intent filters and check incoming intents against white-list
+        // But for now we just strip 'about:reader?url='
+        if (intent != null && intent.getData() != null) {
+            final String url = intent.getData().toString();
+            final String prefix = "about:reader?url=";
+            if (url != null && url.startsWith(prefix)) {
+                final String strippedUrl = url.replace(prefix, "");
+                if (strippedUrl != null) {

[jens, 2017/11/14 11:17:51]

Maybe we should also check && !strippedUrl.isEmpty() to prevent for some weird
errors?

[diegocarloslima, 2017/11/14 11:22:10]

Actually I'm just using the solution that Mozilla itself came up (I should have
made it more explicit). That way, we'll avoid merge issues when merging back to
56 bookmark. That's also why I didn't include any comments referring to the
#6032 ticket

The Mozilla commit can be found here:
https://hg.mozilla.org/mozilla-central/rev/04554768a8e0

+                    intent.setData(Uri.parse(strippedUrl));
+                }
+            }
+        }
+    }
 }