Avoid crash if PackageManager returns bad package name or null

DwyaneQ · Apr 21, 2016 · 262f8d5 · 262f8d5
1 parent 51e4aa1
commit 262f8d5
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java b/ShortcutBadger/src/main/java/me/leolin/shortcutbadger/ShortcutBadger.java
@@ -7,12 +7,20 @@
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.util.Log;
-import me.leolin.shortcutbadger.impl.*;
 
-import java.lang.reflect.Constructor;
 import java.util.LinkedList;
 import java.util.List;
 
+import me.leolin.shortcutbadger.impl.AdwHomeBadger;
+import me.leolin.shortcutbadger.impl.ApexHomeBadger;
+import me.leolin.shortcutbadger.impl.AsusHomeLauncher;
+import me.leolin.shortcutbadger.impl.DefaultBadger;
+import me.leolin.shortcutbadger.impl.NewHtcHomeBadger;
+import me.leolin.shortcutbadger.impl.NovaHomeBadger;
+import me.leolin.shortcutbadger.impl.SolidHomeBadger;
+import me.leolin.shortcutbadger.impl.SonyHomeBadger;
+import me.leolin.shortcutbadger.impl.XiaomiHomeBadger;
+
 
 /**
  * @author Leo Lin
@@ -89,12 +97,11 @@ public static void removeCountOrThrow(Context context) throws ShortcutBadgeExcep
     }
 
     private static void initBadger(Context context) {
-        sComponentName = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()).getComponent();
-
-        Log.d(LOG_TAG, "Finding badger");
-
         //find the home launcher Package
         try {
+            sComponentName = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()).getComponent();
+
+            Log.d(LOG_TAG, "Finding badger");
             Intent intent = new Intent(Intent.ACTION_MAIN);
             intent.addCategory(Intent.CATEGORY_HOME);
             ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);