From d721cb128d837f8fb15e3d55565439c09fa44ef5 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 21 Apr 2022 09:15:07 +0200 Subject: =?UTF-8?q?Fix=20#1461=EF=B8=8F=20Keep=20the=20screen=20on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Niedermann --- .../it/niedermann/owncloud/notes/edit/EditNoteActivity.java | 10 +++++++++- fastlane/metadata/android/en-US/changelogs/3004019.txt | 1 + fastlane/metadata/android/en-US/changelogs/3004020.txt | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/3004020.txt 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 504f333a..a8c21490 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 @@ -1,12 +1,12 @@ package it.niedermann.owncloud.notes.edit; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; import android.view.Menu; import android.view.MenuItem; +import android.view.WindowManager; import android.widget.Toast; import androidx.annotation.NonNull; @@ -72,6 +72,8 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment return; } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + categoryViewModel = new ViewModelProvider(this).get(CategoryViewModel.class); binding = ActivityEditBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); @@ -99,6 +101,12 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment launchNoteFragment(); } + @Override + protected void onStop() { + getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + super.onStop(); + } + private long getNoteId() { return getIntent().getLongExtra(PARAM_NOTE_ID, 0); } diff --git a/fastlane/metadata/android/en-US/changelogs/3004019.txt b/fastlane/metadata/android/en-US/changelogs/3004019.txt index c44a9715..82474b77 100644 --- a/fastlane/metadata/android/en-US/changelogs/3004019.txt +++ b/fastlane/metadata/android/en-US/changelogs/3004019.txt @@ -1,3 +1,4 @@ +- 🐞 Detect missing Notes app on server when importing an account (#1475) - ⚙️ Remove incomplete and outdated translations - ⚙️ Updated dependencies - ⚙️ Requires Android ≥ 6.0 (matching the Nextcloud Android app) \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/3004020.txt b/fastlane/metadata/android/en-US/changelogs/3004020.txt new file mode 100644 index 00000000..f84236a1 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/3004020.txt @@ -0,0 +1 @@ +- 📱️ Keep the screen on (#1461) \ No newline at end of file -- cgit v1.2.3