From 0d0190157848b59adde921c684127e89c8adf5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 25 Jun 2022 12:02:50 +0200 Subject: allow EditNoteActivity to open main application when called from widget. --- .../it/niedermann/owncloud/notes/edit/EditNoteActivity.java | 11 ++++++++++- .../notes/widget/singlenote/SingleNoteWidgetFactory.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java index e9540d35..8cb12bad 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java @@ -32,6 +32,7 @@ import it.niedermann.owncloud.notes.R; import it.niedermann.owncloud.notes.accountpicker.AccountPickerListener; import it.niedermann.owncloud.notes.databinding.ActivityEditBinding; import it.niedermann.owncloud.notes.edit.category.CategoryViewModel; +import it.niedermann.owncloud.notes.main.MainActivity; import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.persistence.entity.Note; import it.niedermann.owncloud.notes.shared.model.NavigationCategory; @@ -283,7 +284,15 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment preferences.edit().putString(prefKeyLastMode, getString(R.string.pref_value_mode_preview)).apply(); } fragment.onCloseNote(); - finish(); + + if(isTaskRoot()) { + Intent intent = new Intent(EditNoteActivity.this, MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); + } else { + finish(); + } + } @Override diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java index 5369d3c7..ffca1a7a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java @@ -87,6 +87,7 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa args.putLong(EditNoteActivity.PARAM_NOTE_ID, note.getId()); args.putLong(EditNoteActivity.PARAM_ACCOUNT_ID, note.getAccountId()); + //args.putBoolean(EditNoteActivity.PARAM_WIDGET_CALLED, true); fillInIntent.putExtras(args); final var note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content); -- cgit v1.2.3