Add check null to handle NPE

Credit to PR: briankabiro#86
thaikhuong62000 · Jan 27, 2024 · 9085493 · 9085493
1 parent 0ac0b4a
commit 9085493
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/android/src/main/java/com/react/SmsModule.java b/android/src/main/java/com/react/SmsModule.java
@@ -121,15 +121,17 @@ else if (fcontent != null && !fcontent.isEmpty())
                     c++;
                 }
             }
-            cursor.close();
+            // I faced a NPE here, plus it's a good practice to have a null check.
+            if (cursor != null) {
+                cursor.close();
+            }
             try {
                 successCallback.invoke(c, jsons.toString());
             } catch (Exception e) {
                 errorCallback.invoke(e.getMessage());
             }
         } catch (JSONException e) {
             errorCallback.invoke(e.getMessage());
-            return;
         }
     }
 
@@ -188,7 +190,6 @@ public void send(String addresses, String text, final Callback errorCallback, fi
                     successCallback.invoke("OK");
                 } catch (PendingIntent.CanceledException e) {
                     errorCallback.invoke(e.getMessage());
-                    return;
                 }
             }
             return;
@@ -211,7 +212,6 @@ public void delete(Integer id, final Callback errorCallback, final Callback succ
             return;
         } catch (Exception e) {
             errorCallback.invoke(e.getMessage());
-            return;
         }
     }