Fixed Self-Check fragment issues and padding

WSTxda · Oct 9, 2024 · 97a5ac1 · 97a5ac1
1 parent d83dd6f
commit 97a5ac1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,5 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
-android.enableJetifier=true
-android.experimental.legacyTransform.forceNonIncremental=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 org.gradle.configuration-cache=true
diff --git a/...ces-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java b/...ces-core/microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractSelfCheckFragment.java
@@ -16,7 +16,6 @@
 
 package org.microg.tools.ui;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -54,11 +53,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         return scrollRoot;
     }
 
-    protected abstract void prepareSelfCheckList(Context context, List<SelfCheckGroup> checks);
+    protected abstract void prepareSelfCheckList(List<SelfCheckGroup> checks);
 
     protected void reset(LayoutInflater inflater) {
         List<SelfCheckGroup> selfCheckGroupList = new ArrayList<SelfCheckGroup>();
-        prepareSelfCheckList(getContext(), selfCheckGroupList);
+        prepareSelfCheckList(selfCheckGroupList);
 
         root.removeAllViews();
         for (SelfCheckGroup group : selfCheckGroupList) {

diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_entry.xml
@@ -30,11 +30,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center_vertical"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
         android:orientation="vertical"
         android:baselineAligned="false"
-        android:layout_marginRight="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp">
 

diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml b/play-services-core/microg-ui-tools/src/main/res/layout/self_check_group.xml
@@ -26,8 +26,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingLeft="?attr/listPreferredItemPaddingLeft"
         android:paddingTop="16dp"

diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java
@@ -16,7 +16,7 @@
 
 package org.microg.gms.ui;
 
-import android.content.Context;
+//import android.content.Context;
 import android.content.Intent;
 //import android.content.pm.PackageManager;
 //import android.content.pm.PermissionGroupInfo;
@@ -30,20 +30,18 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
-import org.microg.gms.common.Constants;
-//import org.microg.tools.selfcheck.InstalledPackagesChecks;
+import org.microg.tools.selfcheck.InstalledPackagesChecks;
 //import org.microg.tools.selfcheck.NlpOsCompatChecks;
 //import org.microg.tools.selfcheck.NlpStatusChecks;
 //import org.microg.tools.selfcheck.PermissionCheckGroup;
-import org.microg.tools.selfcheck.RomSpoofSignatureChecks;
+//import org.microg.tools.selfcheck.RomSpoofSignatureChecks;
 import org.microg.tools.selfcheck.SelfCheckGroup;
 import org.microg.tools.selfcheck.SystemChecks;
 import org.microg.tools.ui.AbstractSelfCheckFragment;
 import org.microg.tools.ui.AbstractSettingsActivity;
 
-//import java.util.ArrayList;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 //import static android.Manifest.permission.ACCESS_BACKGROUND_LOCATION;
 //import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
@@ -54,28 +52,27 @@
 //import static android.Manifest.permission.READ_SMS;
 //import static android.Manifest.permission.RECEIVE_SMS;
 //import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+import static android.os.Build.VERSION.SDK_INT;
 //import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1;
 
 public class SelfCheckFragment extends AbstractSelfCheckFragment {
 
     @Override
-    protected void prepareSelfCheckList(Context context, List<SelfCheckGroup> checks) {
-        if (Objects.equals(context.getPackageName(), Constants.GMS_PACKAGE_NAME)) {
-            checks.add(new RomSpoofSignatureChecks());
-        }
-//        checks.add(new InstalledPackagesChecks());
+    protected void prepareSelfCheckList(List<SelfCheckGroup> checks) {
+//        checks.add(new RomSpoofSignatureChecks());
+        checks.add(new InstalledPackagesChecks());
 //        if (SDK_INT >= 23) {
 //            List<String> permissions = new ArrayList<>();
-//            permissions.add(ACCESS_COARSE_LOCATION);
-//            permissions.add(ACCESS_FINE_LOCATION);
-//            if (SDK_INT >= 29) {
-//                permissions.add(ACCESS_BACKGROUND_LOCATION);
-//            }
-//            permissions.add(READ_EXTERNAL_STORAGE);
-//            permissions.add(WRITE_EXTERNAL_STORAGE);
-//            permissions.add(GET_ACCOUNTS);
-//            permissions.add(READ_PHONE_STATE);
-//            permissions.add(RECEIVE_SMS);
+////            permissions.add(ACCESS_COARSE_LOCATION);
+////            permissions.add(ACCESS_FINE_LOCATION);
+////            if (SDK_INT >= 29) {
+////                permissions.add(ACCESS_BACKGROUND_LOCATION);
+////            }
+////            permissions.add(READ_EXTERNAL_STORAGE);
+////            permissions.add(WRITE_EXTERNAL_STORAGE);
+////            permissions.add(GET_ACCOUNTS);
+////            permissions.add(READ_PHONE_STATE);
+////            permissions.add(RECEIVE_SMS);
 //            checks.add(new PermissionCheckGroup(permissions.toArray(new String[0])) {
 //                @Override
 //                public void doChecks(Context context, ResultCollector collector) {
@@ -99,8 +96,10 @@ protected void prepareSelfCheckList(Context context, List<SelfCheckGroup> checks
 //                }
 //            });
 //        }
-        checks.add(new SystemChecks());
-        //        checks.add(new NlpOsCompatChecks());
+        if (SDK_INT >= Build.VERSION_CODES.M) {
+            checks.add(new SystemChecks());
+        }
+//        checks.add(new NlpOsCompatChecks());
 //        checks.add(new NlpStatusChecks());
     }