From 61de63a5180e954bd197345f49c3b619c94466a7 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 8 Nov 2019 02:15:30 -0500
Subject: [PATCH] Cleanup manifest

---
 app/src/main/AndroidManifest.xml                | 17 ++++-------------
 .../topjohnwu/magisk/ui/flash/FlashActivity.kt  |  6 ++++--
 shared/src/main/AndroidManifest.xml             |  6 ++++--
 stub/src/main/AndroidManifest.xml               | 17 ++++-------------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7a536d0f7..3ed9ea51d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,14 +13,12 @@
         android:name="a.e"
         android:appComponentFactory="a.a"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
         tools:replace="android:appComponentFactory">
 
         <!-- Splash -->
         <activity
             android:name="a.c"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,16 +27,10 @@
         </activity>
 
         <!-- Main -->
-        <activity
-            android:name="a.b"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
+        <activity android:name="a.b" />
 
         <!-- Flashing  -->
-        <activity
-            android:name="a.f"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor" />
+        <activity android:name="a.f" />
 
         <!-- Superuser -->
         <activity
@@ -46,6 +38,7 @@
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -70,9 +63,7 @@
         </receiver>
 
         <!-- DownloadService -->
-        <service
-            android:name="a.j"
-            android:exported="false" />
+        <service android:name="a.j" />
 
         <!-- Hardcode GMS version -->
         <meta-data
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
index 9964a56d2..73609318a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
@@ -2,9 +2,9 @@ package com.topjohnwu.magisk.ui.flash
 
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.net.Uri
 import android.os.Bundle
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
@@ -16,6 +16,7 @@ import com.topjohnwu.magisk.model.events.BackPressEvent
 import com.topjohnwu.magisk.model.events.PermissionEvent
 import com.topjohnwu.magisk.model.events.SnackbarEvent
 import com.topjohnwu.magisk.model.events.ViewEvent
+import com.topjohnwu.magisk.view.Notifications
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.io.File
@@ -32,10 +33,11 @@ open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
         super.onCreate(savedInstanceState)
         val id = intent.getIntExtra(Const.Key.DISMISS_ID, -1)
         if (id != -1)
-            NotificationManagerCompat.from(this).cancel(id)
+            Notifications.mgr.cancel(id)
     }
 
     override fun onBackPressed() {
diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml
index bcec9546e..2b313fbaa 100644
--- a/shared/src/main/AndroidManifest.xml
+++ b/shared/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.shared">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -7,10 +8,11 @@
 
     <application
         android:icon="@drawable/ic_launcher"
-        android:installLocation="internalOnly"
         android:label="Magisk Manager"
+        android:installLocation="internalOnly"
+        android:usesCleartextTraffic="true"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        tools:ignore="UnusedAttribute">
 
         <activity
             android:name="a.r"
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 23fefef29..b04b4dc95 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -13,14 +13,12 @@
         android:name="a.e"
         android:appComponentFactory="a.a"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" >
 
         <!-- Download Activity -->
 
         <activity
             android:name="a.c"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,21 +28,16 @@
 
         <!-- Magisk Manager Components -->
 
-        <activity
-            android:name="a.b"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
+        <activity android:name="a.b" />
 
-        <activity
-            android:name="a.f"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor" />
+        <activity android:name="a.f" />
 
         <activity
             android:name="a.m"
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -67,9 +60,7 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name="a.j"
-            android:exported="false" />
+        <service android:name="a.j" />
 
         <meta-data
             android:name="com.google.android.gms.version"