From 8e73536e02f83c0c62ed5e93fef82ed5d4339686 Mon Sep 17 00:00:00 2001 From: Wang Han <416810799@qq.com> Date: Sat, 8 Mar 2025 15:38:35 +0800 Subject: [PATCH] Remove unused hasGMS variable --- app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt | 1 - .../main/java/com/topjohnwu/magisk/core/di/Networking.kt | 5 +---- .../main/java/com/topjohnwu/magisk/ProviderInstaller.java | 8 +++----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt index 9aba84163..0f5a5504d 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt @@ -47,7 +47,6 @@ object Info { private set private var crypto = "" - var hasGMS = true val isEmulator = Build.DEVICE.contains("vsoc") || getProperty("ro.kernel.qemu", "0") == "1" diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/di/Networking.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/di/Networking.kt index 3ad9db593..92738082f 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/di/Networking.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/di/Networking.kt @@ -5,7 +5,6 @@ import com.squareup.moshi.Moshi import com.topjohnwu.magisk.ProviderInstaller import com.topjohnwu.magisk.core.BuildConfig import com.topjohnwu.magisk.core.Config -import com.topjohnwu.magisk.core.Info import com.topjohnwu.magisk.core.utils.LocaleSetting import okhttp3.Cache import okhttp3.ConnectionSpec @@ -72,9 +71,7 @@ fun createOkHttpClient(context: Context): OkHttpClient { chain.proceed(request.build()) } - if (!ProviderInstaller.install(context)) { - Info.hasGMS = false - } + ProviderInstaller.install(context) return builder.build() } diff --git a/app/shared/src/main/java/com/topjohnwu/magisk/ProviderInstaller.java b/app/shared/src/main/java/com/topjohnwu/magisk/ProviderInstaller.java index bb1b5ca93..cbcaadfaa 100644 --- a/app/shared/src/main/java/com/topjohnwu/magisk/ProviderInstaller.java +++ b/app/shared/src/main/java/com/topjohnwu/magisk/ProviderInstaller.java @@ -7,12 +7,12 @@ public class ProviderInstaller { private static final String GMS_PACKAGE_NAME = "com.google.android.gms"; - public static boolean install(Context context) { + public static void install(Context context) { try { // Check if gms is a system app ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(GMS_PACKAGE_NAME, 0); if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { - return false; + return; } // Try installing new SSL provider from Google Play Service @@ -22,9 +22,7 @@ public class ProviderInstaller { .loadClass("com.google.android.gms.common.security.ProviderInstallerImpl") .getMethod("insertProvider", Context.class) .invoke(null, gms); - } catch (Exception e) { - return false; + } catch (Exception ignored) { } - return true; } }