Update snet extension

app/src/main/java/com/topjohnwu/magisk/Const.kt

@@ -19,8 +19,8 @@ object Const {
     const val MAGISK_LOG = "/cache/magisk.log"
 
     // Versions
-    const val SNET_EXT_VER = 12
-    const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
+    const val SNET_EXT_VER = 13
+    const val SNET_REVISION = "5adbc435ce93ded953c30ebe587edfd50b5503bc"
     const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
 
     // Misc

app/src/main/java/com/topjohnwu/magisk/data/network/GithubServices.kt

@@ -28,7 +28,7 @@ interface GithubRawServices {
     @GET
     fun fetchCustomUpdate(@Url url: String): Single<UpdateInfo>
 
-    @GET("$MAGISK_FILES/{$REVISION}/snet.apk")
+    @GET("$MAGISK_FILES/{$REVISION}/snet.jar")
     @Streaming
     fun fetchSafetynet(@Path(REVISION) revision: String = Const.SNET_REVISION): Single<ResponseBody>
 

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt

@@ -1,8 +1,6 @@
 package com.topjohnwu.magisk.ui.home
 
-import android.app.Activity
 import android.content.Context
-import android.os.Bundle
 import com.skoumal.teanity.extensions.subscribeK
 import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.BuildConfig
@@ -11,7 +9,6 @@ import com.topjohnwu.magisk.Info
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
-import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.events.*
@@ -22,16 +19,20 @@ import com.topjohnwu.magisk.utils.SafetyNetHelper
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.*
 import com.topjohnwu.superuser.Shell
+import dalvik.system.DexFile
+import io.reactivex.Completable
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.io.File
+import java.lang.reflect.InvocationHandler
 
 class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
     SafetyNetHelper.Callback {
 
     override val layoutRes: Int = R.layout.fragment_magisk
     override val viewModel: HomeViewModel by viewModel()
-    val magiskRepo: MagiskRepository by inject()
-    lateinit var EXT_FILE: File
+
+    private val magiskRepo: MagiskRepository by inject()
+    private val EXT_APK by lazy { File("${activity.filesDir.parent}/snet", "snet.jar") }
 
     override fun onResponse(responseCode: Int) = viewModel.finishSafetyNetCheck(responseCode)
 
@@ -48,11 +49,6 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        EXT_FILE = File("${requireActivity().filesDir.parent}/snet", "snet.apk")
-    }
-
     override fun onStart() {
         super.onStart()
         setHasOptionsMenu(true)
@@ -78,7 +74,7 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
 
     private fun downloadSafetyNet(requiresUserInput: Boolean = true) {
         fun download() = magiskRepo.fetchSafetynet()
-                .map { it.byteStream().writeTo(EXT_FILE) }
+                .map { it.byteStream().writeTo(EXT_APK) }
                 .subscribeK { updateSafetyNet(true) }
 
         if (!requiresUserInput) {
@@ -96,29 +92,40 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
     }
 
     private fun updateSafetyNet(dieOnError: Boolean) {
-        try {
+        Completable.fromAction {
             val loader = DynamicClassLoader(EXT_APK)
-            val clazz = loader.loadClass("com.topjohnwu.snet.Snet")
-            val helper = clazz.getMethod("newHelper",
-                    Class::class.java, String::class.java, Activity::class.java, Any::class.java)
-                    .invoke(null, SafetyNetHelper::class.java, EXT_APK.path,
-                            activity, this) as SafetyNetHelper
+            val dex = DexFile.loadDex(EXT_APK.path, EXT_APK.parent, 0)
+
+            // Scan through the dex and find our helper class
+            var helperClass: Class<*>? = null
+            for (className in dex.entries()) {
+                if (className.startsWith("x.")) {
+                    val cls = loader.loadClass(className)
+                    if (InvocationHandler::class.java.isAssignableFrom(cls)) {
+                        helperClass = cls
+                        break
+                    }
+                }
+            }
+            helperClass ?: throw Exception()
+
+            val helper = helperClass.getMethod("get",
+                    Class::class.java, Context::class.java, Any::class.java)
+                    .invoke(null, SafetyNetHelper::class.java, activity, this) as SafetyNetHelper
+
             if (helper.version < Const.SNET_EXT_VER)
                 throw Exception()
+
             helper.attest()
-        } catch (e: Exception) {
+        }.subscribeK(onError = {
             if (dieOnError) {
                 viewModel.finishSafetyNetCheck(-1)
-                return
+            } else {
+                Shell.sh("rm -rf " + EXT_APK.parent).exec()
+                EXT_APK.parentFile?.mkdir()
+                downloadSafetyNet(!dieOnError)
             }
-            Shell.sh("rm -rf " + EXT_APK.parent).exec()
-            EXT_APK.parentFile?.mkdir()
-            downloadSafetyNet(!dieOnError)
-        }
-    }
-
-    companion object {
-        val EXT_APK by lazy { File("${get<Context>().filesDir.parent}/snet", "snet.apk") }
+        })
     }
 }
 

app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt

@@ -1,11 +1,13 @@
 package com.topjohnwu.magisk.ui.home
 
+import android.content.pm.PackageManager
 import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
 import com.skoumal.teanity.extensions.doOnSubscribeUi
 import com.skoumal.teanity.extensions.subscribeK
 import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.data.repository.MagiskRepository
+import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.packageName
 import com.topjohnwu.magisk.extensions.res
 import com.topjohnwu.magisk.extensions.toggle
@@ -31,6 +33,10 @@ class HomeViewModel(
     private val magiskRepo: MagiskRepository
 ) : MagiskViewModel() {
 
+    val hasGMS = runCatching {
+        get<PackageManager>().getPackageInfo("com.google.android.gms", 0); true
+    }.getOrElse { false }
+
     val isAdvancedExpanded = KObservableField(false)
 
     val isForceEncryption = KObservableField(Info.keepEnc)

app/src/main/res/layout/fragment_magisk.xml

@@ -196,7 +196,7 @@
                     android:layout_margin="@dimen/margin_generic" />
 
                 <LinearLayout
-                    gone="@{!viewModel.hasRoot || !viewModel.isConnected}"
+                    gone="@{!viewModel.isConnected || !viewModel.hasGMS}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">