Merge pull request #40 from drivetribe/fix/getclass_nullpointer

Fix currentActivity null pointer exception
jordanbyron · Jun 9, 2017 · c5c4084 · c5c4084
2 parents 2b99081 + c71c4d0
commit c5c4084
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/android/src/main/java/com/reactNativeQuickActions/AppShortcutsModule.java b/android/src/main/java/com/reactNativeQuickActions/AppShortcutsModule.java
@@ -89,6 +89,11 @@ public void setShortcutItems(ReadableArray items) {
             return;
         }
 
+        Activity currentActivity = getCurrentActivity();
+        if (currentActivity == null) {
+            return;
+        }
+
         Context context = getReactApplicationContext();
         mShortcutItems = new ArrayList<>(items.size());
         List<ShortcutInfo> shortcuts = new ArrayList<>(items.size());
@@ -99,7 +104,7 @@ public void setShortcutItems(ReadableArray items) {
 
             int iconResId = context.getResources()
                     .getIdentifier(item.icon, "drawable", context.getPackageName());
-            Intent intent = new Intent(context, getCurrentActivity().getClass());
+            Intent intent = new Intent(context, currentActivity.getClass());
             intent.setAction(ACTION_SHORTCUT);
             intent.putExtra(SHORTCUT_TYPE, item.type);