改进判断是否接入fcm的方法，并显示全部应用

kooritea · Jul 22, 2021 · e92abb4 · e92abb4
1 parent b7c5f0b
commit e92abb4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.kooritea.fcmfix"
         minSdkVersion 29
         targetSdkVersion 30
-        versionCode 13
-        versionName "0.3.0"
+        versionCode 14
+        versionName "0.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/kooritea/fcmfix/MainActivity.java b/app/src/main/java/com/kooritea/fcmfix/MainActivity.java
@@ -69,32 +69,32 @@ private class AppListAdapter  extends BaseAdapter {
             mInflater = LayoutInflater.from(context);
             List<AppInfo> _allowList = new ArrayList<>();
             List<AppInfo> _notAllowList = new ArrayList<>();
+            List<AppInfo> _notFoundFcm = new ArrayList<>();
             PackageManager packageManager = getPackageManager();
             for(PackageInfo packageInfo : packageManager.getInstalledPackages(PackageManager.GET_RECEIVERS)){
                 Boolean flag = false;
+                AppInfo appInfo = new AppInfo(packageInfo);
                 if (packageInfo.receivers != null) {
                     for (ActivityInfo  receiverInfo : packageInfo.receivers ){
-                        if(receiverInfo.name.equals("com.google.firebase.iid.FirebaseInstanceIdReceiver")){
+                        if(receiverInfo.name.equals("com.google.firebase.iid.FirebaseInstanceIdReceiver") || receiverInfo.name.equals("com.google.android.gms.measurement.AppMeasurementReceiver")){
                             flag = true;
                             break;
                         }
                     }
-                }else{
-                    continue;
                 }
                 if(!flag){
-                    continue;
-                }
-                AppInfo appInfo = new AppInfo(packageInfo);
-                for(String item : allowList){
-                    if(item.equals(appInfo.packageName)){
-                        appInfo.isAllow = true;
-                        _allowList.add(appInfo);
-                        break;
+                    _notFoundFcm.add(appInfo);
+                }else{
+                    for(String item : allowList){
+                        if(item.equals(appInfo.packageName)){
+                            appInfo.isAllow = true;
+                            _allowList.add(appInfo);
+                            break;
+                        }
+                    }
+                    if(!appInfo.isAllow){
+                        _notAllowList.add(appInfo);
                     }
-                }
-                if(!appInfo.isAllow){
-                    _notAllowList.add(appInfo);
                 }
             }
             Collections.sort(_allowList, new Comparator<AppInfo>() {
@@ -109,7 +109,14 @@ public int compare(AppInfo o1, AppInfo o2) {
                     return Collator.getInstance(Locale.CHINESE).compare(o1.name,o2.name);
                 }
             });
+            Collections.sort(_notFoundFcm, new Comparator<AppInfo>() {
+                @Override
+                public int compare(AppInfo o1, AppInfo o2) {
+                    return Collator.getInstance(Locale.CHINESE).compare(o1.name,o2.name);
+                }
+            });
             _allowList.addAll(_notAllowList);
+            _allowList.addAll(_notFoundFcm);
             this.appList = _allowList;
         }
         @Override