Bug 929865 - Part 1: Reference org.mozilla.gecko directly when handling application/webapp intent. r=myk
authorNick Alexander <nalexander@mozilla.com>
Tue, 24 Jun 2014 18:20:12 -0700
changeset 190649 0a15f881d83798477f95ec39f59ccb6601b06232
parent 190648 348cffe9034465fc7a107048cb50fd905afc38cb
child 190650 457213f9d86736c192847fafcd13735d4652afb5
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmyk
bugs929865
milestone33.0a1
Bug 929865 - Part 1: Reference org.mozilla.gecko directly when handling application/webapp intent. r=myk
mobile/android/base/WebappManifestFragment.xml.frag.in
mobile/android/base/webapp/Dispatcher.java
--- a/mobile/android/base/WebappManifestFragment.xml.frag.in
+++ b/mobile/android/base/WebappManifestFragment.xml.frag.in
@@ -1,9 +1,9 @@
-        <activity android:name=".WebApps$WebApp@APPNUM@"
+        <activity android:name="org.mozilla.gecko.WebApps$WebApp@APPNUM@"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"
                   android:process=":@ANDROID_PACKAGE_NAME@.Webapp@APPNUM@"
                   android:theme="@style/Gecko.App"
                   android:launchMode="singleTop"
                   android:exported="true"
         />
--- a/mobile/android/base/webapp/Dispatcher.java
+++ b/mobile/android/base/webapp/Dispatcher.java
@@ -39,17 +39,17 @@ public class Dispatcher extends Activity
         boolean isInstalled = index >= 0;
         if (!isInstalled) {
             index = allocator.findOrAllocatePackage(packageName);
         }
 
         // Copy the intent, without interfering with it.
         Intent intent = new Intent(getIntent());
 
-        // Only change it's destination.
-        intent.setClassName(getApplicationContext(), getPackageName() + ".WebApps$WebApp" + index);
+        // Only change its destination.
+        intent.setClassName(getApplicationContext(), "org.mozilla.gecko.WebApps$WebApp" + index);
 
         // If and only if we haven't seen this before.
         intent.putExtra("isInstalled", isInstalled);
 
         startActivity(intent);
     }
 }