fix showing notification counters on Honor devices

taken from leolin310148#361 , not tested
tibbi · Aug 25, 2021 · 8009423 · 8009423
1 parent 01e8e62
commit 8009423
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java b/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java
@@ -258,13 +258,23 @@ private static boolean isLauncherVersionSupported(Context context, String curren
 
     /**
      * Making sure the default Home activity is on top of the returned list
-     * @param defaultActivity       default Home activity
-     * @param resolveInfos          list of all Home activities in the system
+     *
+     * @param defaultActivity default Home activity
+     * @param resolveInfos    list of all Home activities in the system
      */
     private static void validateInfoList(ResolveInfo defaultActivity, List<ResolveInfo> resolveInfos) {
+        if (resolveInfos == null || resolveInfos.isEmpty()) {
+            return;
+        }
+        if (!hasPackageName(defaultActivity)) {
+            return;
+        }
         int indexToSwapWith = 0;
         for (int i = 0, resolveInfosSize = resolveInfos.size(); i < resolveInfosSize; i++) {
             ResolveInfo resolveInfo = resolveInfos.get(i);
+            if (!hasPackageName(resolveInfo)) {
+                continue;
+            }
             String currentActivityName = resolveInfo.activityInfo.packageName;
             if (currentActivityName.equals(defaultActivity.activityInfo.packageName)) {
                 indexToSwapWith = i;
@@ -273,6 +283,13 @@ private static void validateInfoList(ResolveInfo defaultActivity, List<ResolveIn
         Collections.swap(resolveInfos, 0, indexToSwapWith);
     }
 
+    private static boolean hasPackageName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.activityInfo == null) {
+            return false;
+        }
+        return resolveInfo.activityInfo.packageName != null;
+    }
+
     // Avoid anybody to instantiate this class
     private ShortcutBadger() {
 

diff --git a/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/impl/HuaweiHomeBadger.java b/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/impl/HuaweiHomeBadger.java
@@ -28,7 +28,8 @@ public void executeBadge(Context context, ComponentName componentName, int badge
     @Override
     public List<String> getSupportLaunchers() {
         return Arrays.asList(
-                "com.huawei.android.launcher"
+                "com.huawei.android.launcher",
+                "com.hihonor.android.launcher"
         );
     }
 }