Fix a few lint warnings

Signed-off-by: Stefan Niedermann <info@niedermann.it>

5 files changed, 6 insertions, 3 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java
index fc4b8fc6..29d2d0ad 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java
@@ -42,7 +42,7 @@ public class AppendToNoteActivity extends MainActivity {
                 fullNote$.removeObservers(this);
                 final String oldContent = fullNote.getContent();
                 String newContent;
-                if (oldContent != null && oldContent.length() > 0) {
+                if (!TextUtils.isEmpty(oldContent)) {
                     newContent = oldContent + "\n\n" + receivedText;
                 } else {
                     newContent = receivedText;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
index 298a6c3f..53ffb3b4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
@@ -184,7 +184,8 @@ public class NoteEditFragment extends SearchableBaseNoteFragment {
      */
     @Override
     protected String getContent() {
-        return binding.editContent.getText().toString();
+        final Editable editable = binding.editContent.getText();
+        return editable == null ? "" : editable.toString();
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
index 00b41298..2abbd82d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
@@ -131,7 +131,7 @@ public class ImportAccountActivity extends AppCompatActivity {
                             } else if (t instanceof NetworkErrorException) {
                                 binding.status.setText(getString(R.string.error_sync, getString(R.string.error_no_network)));
                                 binding.status.setVisibility(View.VISIBLE);
-                            } else if (t instanceof UnknownErrorException && t.getMessage().contains("No address associated with hostname")) {
+                            } else if (t instanceof UnknownErrorException && t.getMessage() != null && t.getMessage().contains("No address associated with hostname")) {
                                 // https://github.com/stefan-niedermann/nextcloud-notes/issues/1014
                                 binding.status.setText(R.string.you_have_to_be_connected_to_the_internet_in_order_to_add_an_account);
                                 binding.status.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
index 847d2247..016b2fd0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Account.java
@@ -214,6 +214,7 @@ public class Account implements Serializable {
         return result;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Account{" +
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
index 376c099d..e0d0325c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/Note.java
@@ -255,6 +255,7 @@ public class Note implements Serializable, Item {
         return result;
     }
 
+    @NonNull
     @Override
     public String toString() {
         return "Note{" +