From 9b401b2cd934c134ff9d3c9be16826136e982b45 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 3 Feb 2012 13:09:28 -0800
Subject: [PATCH] Bug 718703 - Part 1: Sync crashes from Pair a Device link in
 sync settings. r=rnewman

---
 .../{sync_icon.png => sync_ic_launcher.png}         | Bin
 .../base/resources/xml/sync_authenticator.xml       |   6 +++---
 .../xml/{sync_options.xml => sync_options.xml.in}   |   5 +++--
 mobile/android/sync/android-drawable-resources.mn   |   2 +-
 mobile/android/sync/android-xml-resources.mn        |   1 -
 .../manifests/SyncAndroidManifest_activities.xml.in |   8 ++------
 mobile/android/sync/strings.xml.in                  |   3 ++-
 7 files changed, 11 insertions(+), 14 deletions(-)
 rename mobile/android/base/resources/drawable/{sync_icon.png => sync_ic_launcher.png} (100%)
 rename mobile/android/base/resources/xml/{sync_options.xml => sync_options.xml.in} (86%)

diff --git a/mobile/android/base/resources/drawable/sync_icon.png b/mobile/android/base/resources/drawable/sync_ic_launcher.png
similarity index 100%
rename from mobile/android/base/resources/drawable/sync_icon.png
rename to mobile/android/base/resources/drawable/sync_ic_launcher.png
diff --git a/mobile/android/base/resources/xml/sync_authenticator.xml b/mobile/android/base/resources/xml/sync_authenticator.xml
index 634ef2af4f0..bbf4b7a87a7 100644
--- a/mobile/android/base/resources/xml/sync_authenticator.xml
+++ b/mobile/android/base/resources/xml/sync_authenticator.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="org.mozilla.firefox_sync"
-    android:icon="@drawable/sync_icon"
-    android:smallIcon="@drawable/sync_icon"
+    android:icon="@drawable/sync_ic_launcher"
+    android:smallIcon="@drawable/sync_ic_launcher"
     android:label="@string/sync_account_label"
-    android:accountPreferences="@xml/sync_options" />
\ No newline at end of file
+    android:accountPreferences="@xml/sync_options" />
diff --git a/mobile/android/base/resources/xml/sync_options.xml b/mobile/android/base/resources/xml/sync_options.xml.in
similarity index 86%
rename from mobile/android/base/resources/xml/sync_options.xml
rename to mobile/android/base/resources/xml/sync_options.xml.in
index b0480d010a0..159eca9f571 100644
--- a/mobile/android/base/resources/xml/sync_options.xml
+++ b/mobile/android/base/resources/xml/sync_options.xml.in
@@ -1,3 +1,4 @@
+#filter substitution
 <?xml version="1.0" encoding="UTF-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
   <PreferenceCategory
@@ -8,11 +9,11 @@
     android:summary="@string/sync_settings_summary_pair">
     <intent
       android:action="android.intent.action.MAIN"
-      android:targetPackage="org.mozilla.gecko"
+      android:targetPackage="@ANDROID_PACKAGE_NAME@"
       android:targetClass="org.mozilla.gecko.sync.setup.activities.SetupSyncActivity">
       <extra
         android:name="isSetup"
         android:value="false" />
     </intent>
   </PreferenceScreen>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/mobile/android/sync/android-drawable-resources.mn b/mobile/android/sync/android-drawable-resources.mn
index ab2b76c5d5d..35931c8c4d3 100644
--- a/mobile/android/sync/android-drawable-resources.mn
+++ b/mobile/android/sync/android-drawable-resources.mn
@@ -1,2 +1,2 @@
 mobile/android/base/resources/drawable/pin_background.xml
-mobile/android/base/resources/drawable/sync_icon.png
+mobile/android/base/resources/drawable/sync_ic_launcher.png
diff --git a/mobile/android/sync/android-xml-resources.mn b/mobile/android/sync/android-xml-resources.mn
index 746b3ff5bc1..73ac49ada82 100644
--- a/mobile/android/sync/android-xml-resources.mn
+++ b/mobile/android/sync/android-xml-resources.mn
@@ -1,3 +1,2 @@
 mobile/android/base/resources/xml/sync_authenticator.xml
-mobile/android/base/resources/xml/sync_options.xml
 mobile/android/base/resources/xml/sync_syncadapter.xml
diff --git a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in b/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
index 733106faedb..64a2b633ac1 100644
--- a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
+++ b/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
@@ -1,7 +1,6 @@
         <activity
             android:icon="@drawable/sync_ic_launcher"
             android:label="@string/sync_app_name"
-            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:configChanges="orientation"
             android:windowSoftInputMode="adjustResize|stateHidden"
@@ -12,17 +11,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="sync" android:host="org.mozilla.android" android:path="/setup"/>
+                <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
             android:clearTaskOnLaunch="true"
-            android:launchMode="singleTask"
             android:name="org.mozilla.gecko.sync.setup.activities.AccountActivity"
             android:windowSoftInputMode="adjustPan|stateHidden"/>
         <activity
             android:name="org.mozilla.gecko.sync.setup.activities.SetupFailureActivity" />
         <activity
-            android:name="org.mozilla.gecko.sync.setup.activities.SetupSuccessActivity"
-            android:launchMode="singleTask" />
\ No newline at end of file
+            android:name="org.mozilla.gecko.sync.setup.activities.SetupSuccessActivity" />
\ No newline at end of file
diff --git a/mobile/android/sync/strings.xml.in b/mobile/android/sync/strings.xml.in
index 6c83c33a0b8..17c04a93f91 100644
--- a/mobile/android/sync/strings.xml.in
+++ b/mobile/android/sync/strings.xml.in
@@ -59,4 +59,5 @@
   <string name="bookmarks_folder_mobile">&bookmarks.folder.mobile.label;</string>
 
   <!-- Notification strings -->
-  <string name="sync_notification_oneaccount">&sync.notification.oneaccount.label;</string>
\ No newline at end of file
+  <string name="sync_notification_oneaccount">&sync.notification.oneaccount.label;</string>
+