fix git conflict

Signed-off-by: alperozturk <[email protected]>

[skip ci]

Author: alperozturk96

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

@@ -153,6 +153,10 @@ private void loadExistingNote(long noteId) {
 
         isNew = false;
         note = originalNote = repo.getNoteById(noteId);
+        if (note == null) {
+            Log_OC.d(TAG, "remoteNoteId will be used to get note");
+            note = repo.getNoteByRemoteId(noteId);
+        }
     }
 
     private void createNewNote() {
@@ -325,6 +329,37 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    private void pinNoteToHome() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        if (!ShortcutManagerCompat.isRequestPinShortcutSupported(requireContext())) {
+            Log.i(TAG, "RequestPinShortcut is not supported");
+            return;
+        }
+
+        final var iconId = note.getFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_grey_ccc_24dp;
+        final var icon = IconCompat.createWithResource(requireContext().getApplicationContext(), iconId);
+        final var intent = new Intent(getActivity(), EditNoteActivity.class)
+                .putExtra(EditNoteActivity.PARAM_NOTE_ID, note.getRemoteId())
+                .setAction(ACTION_SHORTCUT);
+        final var noteId = String.valueOf(note.getRemoteId());
+
+        final var pinShortcutInfo = new ShortcutInfoCompat.Builder(requireContext(), noteId)
+                .setShortLabel(note.getTitle())
+                .setIcon(icon)
+                .setIntent(intent)
+                .build();
+
+        final var broadcastIntent = ShortcutManagerCompat.createShortcutResultIntent(requireContext(), pinShortcutInfo);
+        final var intentFlag = pendingIntentFlagCompat(0);
+        final var intentSender = PendingIntent
+                .getBroadcast(requireContext(), 0, broadcastIntent, intentFlag)
+                .getIntentSender();
+        ShortcutManagerCompat.requestPinShortcut(requireContext(), pinShortcutInfo, intentSender);
+    }
+
     protected void shareNote() {
         if (note == null) {
             Log_OC.w(TAG, "Note is null in shareNote");