Replace @NotNull jetbrains annotation with @NonNull androidx annotation

9 files changed, 14 insertions, 30 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
index 41303cac6..6f3913f45 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java
@@ -6,8 +6,6 @@ import androidx.room.Ignore;
 import androidx.room.Junction;
 import androidx.room.Relation;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -130,7 +128,7 @@ public class FullCard implements IRemoteEntity, DragAndDropModel {
         return card;
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "FullCard{" +
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
index f3892dfa5..54fb192ff 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/internal/FilterInformation.java
@@ -3,8 +3,6 @@ package it.niedermann.nextcloud.deck.model.internal;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +45,7 @@ public class FilterInformation implements Serializable {
         return users;
     }
 
-    @NotNull
+    @NonNull
     public List<Label> getLabels() {
         return labels;
     }
@@ -68,7 +66,7 @@ public class FilterInformation implements Serializable {
         users.remove(user);
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "FilterInformation{" +
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
index 7ef97a294..c04512ad2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/ocs/Version.java
@@ -6,8 +6,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -125,7 +123,7 @@ public class Version implements Comparable<Version> {
         return 0;
     }
 
-    @NotNull
+    @NonNull
     @Override
     public String toString() {
         return "Version{" +
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
index f0e33a0e7..9913c0ba2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
@@ -8,8 +8,6 @@ import androidx.annotation.WorkerThread;
 import androidx.lifecycle.LiveData;
 import androidx.sqlite.db.SimpleSQLiteQuery;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -57,7 +55,7 @@ public class DataBaseAdapter {
         this.db = DeckDatabase.getInstance(applicationContext);
     }
 
-    @NotNull
+    @NonNull
     public Context getContext() {
         return context;
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedAlertDialogBuilder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedAlertDialogBuilder.java
index cfeffe7dc..880e21073 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedAlertDialogBuilder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedAlertDialogBuilder.java
@@ -9,8 +9,6 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
-import org.jetbrains.annotations.NotNull;
-
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
 import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.readBrandMainColor;
 
@@ -22,7 +20,7 @@ public class BrandedAlertDialogBuilder extends AlertDialog.Builder implements Br
         super(context);
     }
 
-    @NotNull
+    @NonNull
     @Override
     public AlertDialog create() {
         this.dialog = super.create();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionHandler.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionHandler.java
index 8f0bfce33..53c99d52c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionHandler.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionHandler.java
@@ -2,7 +2,7 @@ package it.niedermann.nextcloud.deck.ui.exception;
 
 import android.app.Activity;
 
-import org.jetbrains.annotations.NotNull;
+import androidx.annotation.NonNull;
 
 public class ExceptionHandler implements Thread.UncaughtExceptionHandler {
 
@@ -14,7 +14,7 @@ public class ExceptionHandler implements Thread.UncaughtExceptionHandler {
     }
 
     @Override
-    public void uncaughtException(@NotNull Thread t, Throwable e) {
+    public void uncaughtException(@NonNull Thread t, Throwable e) {
         context.getApplicationContext().startActivity(ExceptionActivity.createIntent(context, e));
         context.finish();
         Runtime.getRuntime().exit(0);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
index 35a98efd7..af368b92a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
@@ -6,8 +6,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 
-import org.jetbrains.annotations.NotNull;
-
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemPrepareCreateAccountBinding;
@@ -27,9 +25,9 @@ public class AccountAdapter extends AbstractAdapter<Account> {
         return item.getId();
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public View getView(int position, View convertView, @NotNull ViewGroup parent) {
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         final ItemPrepareCreateAccountBinding binding;
         if (convertView == null) {
             binding = ItemPrepareCreateAccountBinding.inflate(inflater, parent, false);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
index 190c55e4b..5cda9e877 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
@@ -6,8 +6,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 
-import org.jetbrains.annotations.NotNull;
-
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemPrepareCreateBoardBinding;
@@ -26,9 +24,9 @@ public class BoardAdapter extends AbstractAdapter<Board> {
         return item.getLocalId();
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public View getView(int position, View convertView, @NotNull ViewGroup parent) {
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         final ItemPrepareCreateBoardBinding binding;
         if (convertView == null) {
             binding = ItemPrepareCreateBoardBinding.inflate(inflater, parent, false);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/StackAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/StackAdapter.java
index 89c702075..5d1ee22ce 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/StackAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/StackAdapter.java
@@ -6,8 +6,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 
-import org.jetbrains.annotations.NotNull;
-
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.ItemPrepareCreateStackBinding;
@@ -25,9 +23,9 @@ public class StackAdapter extends AbstractAdapter<FullStack> {
         return item.getLocalId();
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public View getView(int position, View convertView, @NotNull ViewGroup parent) {
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
         final ItemPrepareCreateStackBinding binding;
         if (convertView == null) {
             binding = ItemPrepareCreateStackBinding.inflate(inflater, parent, false);