Fix Add search string to a header for a new created note (#302)v2.8.0

7 files changed, 42 insertions, 4 deletions

diff --git a/app/build.gradle b/app/build.gradle
index c7c74304..09951dda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 29
         versionCode 75
-        versionName "2.7.1"
+        versionName "2.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
index a3f5c560..4db29f06 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
@@ -43,6 +43,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
     public static final String PARAM_NOTE_ID = "noteId";
     public static final String PARAM_ACCOUNT_ID = "accountId";
     public static final String PARAM_CATEGORY = "category";
+    public static final String PARAM_CONTENT = "content";
 
     private BaseNoteFragment fragment;
 
@@ -163,13 +164,19 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
 
         String content = "";
         if (
+                intent.hasExtra(Intent.EXTRA_TEXT) &&
                 MIMETYPE_TEXT_PLAIN.equals(intent.getType()) &&
                         (Intent.ACTION_SEND.equals(intent.getAction()) ||
                                 INTENT_GOOGLE_ASSISTANT.equals(intent.getAction()))
         ) {
             content = intent.getStringExtra(Intent.EXTRA_TEXT);
+        } else if (intent.hasExtra(PARAM_CONTENT)) {
+            content = intent.getStringExtra(PARAM_CONTENT);
         }
 
+        if (content == null) {
+            content = "";
+        }
         CloudNote newNote = new CloudNote(0, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, favorite, category, null);
         fragment = NoteEditFragment.newInstanceWithNewNote(newNote);
         getSupportFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index e334ddca..a9d6806c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -336,6 +336,10 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
         fabCreate.setOnClickListener((View view) -> {
             Intent createIntent = new Intent(getApplicationContext(), EditNoteActivity.class);
             createIntent.putExtra(EditNoteActivity.PARAM_CATEGORY, navigationSelection);
+            if (searchView != null && !searchView.isIconified() && searchView.getQuery().length() > 0) {
+                createIntent.putExtra(EditNoteActivity.PARAM_CONTENT, searchView.getQuery().toString());
+                invalidateOptionsMenu();
+            }
             startActivityForResult(createIntent, create_note_cmd);
         });
     }
@@ -800,7 +804,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
         if (searchView == null || searchView.isIconified()) {
             super.onBackPressed();
         } else {
-            searchView.setIconified(true);
+            invalidateOptionsMenu();
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
index a6432ff4..eeab2e1e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
@@ -92,7 +92,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
                         if (content == null) {
                             throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing.");
                         } else {
-                            note = new DBNote(-1, -1, null, NoteUtil.generateNonEmptyNoteTitle(content, getContext()), content, false, getString(R.string.category_readonly), null, DBStatus.VOID, -1, "");
+                            note = new DBNote(-1, -1, null, NoteUtil.generateNoteTitle(content), content, false, getString(R.string.category_readonly), null, DBStatus.VOID, -1, "");
                         }
                     } else {
                         note = db.getNote(localAccount.getId(), db.addNoteAndSync(localAccount.getId(), cloudNote));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
index d31c5816..060e1743 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java
@@ -105,7 +105,7 @@ public class NoteUtil {
      * @return excerpt String
      */
     @NonNull
-    static String generateNoteTitle(@NonNull String content) {
+    public static String generateNoteTitle(@NonNull String content) {
         return getLineWithoutMarkDown(content, 0);
     }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/76.txt b/fastlane/metadata/android/en-US/changelogs/76.txt
index e69de29b..5e09431a 100644
--- a/fastlane/metadata/android/en-US/changelogs/76.txt
+++ b/fastlane/metadata/android/en-US/changelogs/76.txt
@@ -0,0 +1,27 @@
+v2.8.0
+
+- Add search string to a header for a new created note 🔎 (#302)
+
+v2.7.1
+
+- Fix creating new notes using launcher shortcuts
+
+v2.7.0
+
+- Allow rendering of any text file (#439, #692)
+
+v2.6.0
+
+- Improved in-note search 🔎 (#106, #400, #550, #700)
+
+v2.5.0
+
+- Move notes to another account (#655)
+- Internal Note Links (#646, #623, #202)
+- Cancel and Delete are redundant on new note (#640)
+- Undo for bulk delete (#670)
+- Checklist auto-continuation (#688, #608)
+- Fix database upgrade issues (#696)
+
+Requires at least Files app¹ version 3.9.0
+¹ https://github.com/nextcloud/android
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/77.txt b/fastlane/metadata/android/en-US/changelogs/77.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/77.txt