From 7532477a2fccb13ee0f68166500a10911d1de389 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 15 Jan 2020 00:51:27 +0800
Subject: [PATCH] Make release builds work

---
 app/proguard-rules.pro                               | 12 +++---------
 .../com/topjohnwu/magisk/core/GeneralReceiver.kt     | 12 ++++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 187850117..44ae7fed2 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -23,21 +23,15 @@
   void onResponse(int);
 }
 
-# Keep all fragment constructors
--keepclassmembers class * extends androidx.fragment.app.Fragment {
-  public <init>(...);
-}
+# Fragments
+-keep,allowobfuscation class * extends androidx.fragment.app.Fragment
 
-# DelegateWorker
+# BaseWorkerWrapper
 -keep,allowobfuscation class * extends com.topjohnwu.magisk.core.base.BaseWorkerWrapper
 
 # BootSigner
 -keep class a.a { *; }
 
-# Workaround R8 bug
--keep,allowobfuscation class com.topjohnwu.magisk.core.GeneralReceiver
--keepclassmembers class a.e { *; }
-
 # Strip logging
 -assumenosideeffects class timber.log.Timber.Tree { *; }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
index bb2c0eb4a..ac0c384fe 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
@@ -5,12 +5,12 @@ import android.content.Intent
 import com.topjohnwu.magisk.core.base.BaseReceiver
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.magiskdb.PolicyDao
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
-import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.core.model.ManagerJson
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+import com.topjohnwu.magisk.core.view.Shortcuts
+import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.model.entity.internal.Configuration
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
-import com.topjohnwu.magisk.core.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 import org.koin.core.inject
 
@@ -27,11 +27,7 @@ open class GeneralReceiver : BaseReceiver() {
 
         when (intent.action ?: return) {
             Intent.ACTION_REBOOT -> {
-                SuCallbackHandler(
-                    context,
-                    intent.getStringExtra("action"),
-                    intent.extras
-                )
+                SuCallbackHandler(context, intent.getStringExtra("action"), intent.extras)
             }
             Intent.ACTION_PACKAGE_REPLACED -> {
                 // This will only work pre-O