From 9348939ce6f70b27db82abde3c80c30bd62fd560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABlle=20van=20Essen?= <joelle@v-essen.nl>
Date: Sun, 15 May 2022 11:30:23 +0200
Subject: [PATCH] Fix NullPointerException (#67)

---
 .../nitterizeme/activities/AppsPickerActivity.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/app/fedilab/nitterizeme/activities/AppsPickerActivity.java b/app/src/main/java/app/fedilab/nitterizeme/activities/AppsPickerActivity.java
index f611f55..8cb5080 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/activities/AppsPickerActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/activities/AppsPickerActivity.java
@@ -14,6 +14,12 @@ package app.fedilab.nitterizeme.activities;
  * You should have received a copy of the GNU General Public License along with UntrackMe; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import static app.fedilab.nitterizeme.activities.MainActivity.APP_PREFS;
+import static app.fedilab.nitterizeme.helpers.Utils.INTENT_ACTION;
+import static app.fedilab.nitterizeme.helpers.Utils.KILL_ACTIVITY;
+import static app.fedilab.nitterizeme.helpers.Utils.LAST_USED_APP_PACKAGE;
+import static app.fedilab.nitterizeme.helpers.Utils.URL_APP_PICKER;
+
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -39,12 +45,6 @@ import app.fedilab.nitterizeme.helpers.Utils;
 import app.fedilab.nitterizeme.sqlite.DefaultAppDAO;
 import app.fedilab.nitterizeme.sqlite.Sqlite;
 
-import static app.fedilab.nitterizeme.activities.MainActivity.APP_PREFS;
-import static app.fedilab.nitterizeme.helpers.Utils.INTENT_ACTION;
-import static app.fedilab.nitterizeme.helpers.Utils.KILL_ACTIVITY;
-import static app.fedilab.nitterizeme.helpers.Utils.LAST_USED_APP_PACKAGE;
-import static app.fedilab.nitterizeme.helpers.Utils.URL_APP_PICKER;
-
 
 public class AppsPickerActivity extends Activity {
 
@@ -179,7 +179,7 @@ public class AppsPickerActivity extends Activity {
                 long val = -1;
                 if (isPresent) {
                     ArrayList<String> oldConcurrent = new DefaultAppDAO(AppsPickerActivity.this, db).getConcurrent(appToUse);
-                    ArrayList<String> newConcurrent = Utils.union(oldConcurrent, packages);
+                    ArrayList<String> newConcurrent = oldConcurrent != null ? Utils.union(oldConcurrent, packages) : packages;
                     newConcurrent.remove(appToUse);
                     new DefaultAppDAO(AppsPickerActivity.this, db).update(appToUse, newConcurrent);
                 } else {