From c683e059e758c16bd93dd9e970238d5bb6fde616 Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Sun, 17 Jun 2018 23:09:40 -0600
Subject: [PATCH] Fix Android-x86 crashes related to manifest changes

---
 app/build.gradle                       |  1 +
 app/src/androidx86/AndroidManifest.xml |  8 ++++----
 app/src/playstore/AndroidManifest.xml  | 10 ++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d6714e9..cd7dc0c7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,7 @@ android {
         minSdkVersion 21
         targetSdkVersion SDK_VERSION
 
+        // TODO keep versionName and versionCode in sync with Android-x86 manifest
         versionCode 184
         versionName "3.9.2"
 
diff --git a/app/src/androidx86/AndroidManifest.xml b/app/src/androidx86/AndroidManifest.xml
index bdae7674..7fbbbb54 100644
--- a/app/src/androidx86/AndroidManifest.xml
+++ b/app/src/androidx86/AndroidManifest.xml
@@ -54,6 +54,10 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
 
+        <activity
+            android:name=".activity.MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"/>
         <activity-alias
             android:name=".MainActivity"
             android:targetActivity=".activity.MainActivity"
@@ -66,10 +70,6 @@
             </intent-filter>
         </activity-alias>
         <activity
-            android:name=".activity.MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"/>
-        <activity
             android:name=".activity.InvisibleActivity"
             android:documentLaunchMode="always"
             android:excludeFromRecents="true"
diff --git a/app/src/playstore/AndroidManifest.xml b/app/src/playstore/AndroidManifest.xml
index e7cd9bbe..238ab7fc 100644
--- a/app/src/playstore/AndroidManifest.xml
+++ b/app/src/playstore/AndroidManifest.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 
+<!-- TODO when making changes to the manifest, be sure to update the Android-x86 manifest as well -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.farmerbb.taskbar">
@@ -63,6 +65,10 @@
         android:label="${appName}"
         android:theme="@style/AppTheme" >
 
+        <activity
+            android:name=".activity.MainActivity"
+            android:label="${appName}"
+            android:launchMode="singleTask"/>
         <activity-alias
             android:name=".MainActivity"
             android:targetActivity=".activity.MainActivity"
@@ -75,10 +81,6 @@
             </intent-filter>
         </activity-alias>
         <activity
-            android:name=".activity.MainActivity"
-            android:label="${appName}"
-            android:launchMode="singleTask"/>
-        <activity
             android:name=".activity.InvisibleActivity"
             android:documentLaunchMode="always"
             android:excludeFromRecents="true"
-- 
2.11.0