From 59de26b9ed18597854b3ce62c9f5949e2026fc69 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Mon, 6 Oct 2025 15:59:37 +0200 Subject: [PATCH] chore: upgrade android sdk 36 Signed-off-by: alperozturk --- app/build.gradle | 4 +-- .../owncloud/notes/LockedActivity.java | 16 +++++++----- .../owncloud/notes/edit/EditNoteActivity.java | 16 +++++++----- .../owncloud/notes/main/MainActivity.java | 26 +++++++++++-------- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8cdd28e8a..25b613ea5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,13 +11,13 @@ apply plugin: 'com.android.application' apply plugin: 'org.jetbrains.kotlin.android' android { - compileSdkVersion 35 namespace = 'it.niedermann.owncloud.notes' defaultConfig { applicationId "it.niedermann.owncloud.notes" minSdk 24 - targetSdk 35 + compileSdk = 36 + targetSdk 36 versionCode 40060005 versionName "4.6.0 Alpha 5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java index 5270dda23..53115a184 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java @@ -15,6 +15,7 @@ import android.util.Log; import android.view.WindowManager; +import androidx.activity.OnBackPressedCallback; import androidx.annotation.Nullable; import androidx.preference.PreferenceManager; @@ -41,6 +42,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { if (isTaskRoot()) { askToUnlock(); } + + getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { + @Override + public void handleOnBackPressed() { + setEnabled(false); + getOnBackPressedDispatcher().onBackPressed(); + NotesApplication.updateLastInteraction(); + } + }); } @Override @@ -60,12 +70,6 @@ protected void onStop() { } } - @Override - public void onBackPressed() { - super.onBackPressed(); - NotesApplication.updateLastInteraction(); - } - @Override public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) { NotesApplication.updateLastInteraction(); 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 da082f2eb..3abd1ad2f 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 @@ -18,6 +18,7 @@ import android.view.WindowManager; import android.widget.Toast; +import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.graphics.Insets; @@ -105,6 +106,15 @@ protected void onCreate(final Bundle savedInstanceState) { setSupportActionBar(binding.toolbar); binding.toolbar.setOnClickListener((v) -> fragment.showEditTitleDialog()); setImeInsets(); + + getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { + @Override + public void handleOnBackPressed() { + setEnabled(false); + getOnBackPressedDispatcher().onBackPressed(); + close(); + } + }); } private void setImeInsets() { @@ -357,12 +367,6 @@ private void launchReadonlyNote() { replaceFragment(); } - @Override - public void onBackPressed() { - super.onBackPressed(); - close(); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu_note_activity, menu); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 83e7201c1..34d315fbe 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -29,6 +29,7 @@ import android.util.Log; import android.view.View; +import androidx.activity.OnBackPressedCallback; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -329,6 +330,20 @@ public void onError(@NonNull Throwable t) { menuAdapter.updateAccount(this, nextAccount); } }); + + getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { + @Override + public void handleOnBackPressed() { + if (activityBinding.searchToolbar.getVisibility() == VISIBLE) { + updateToolbars(false); + } else if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) { + binding.drawerLayout.closeDrawer(GravityCompat.START); + } else { + setEnabled(false); + getOnBackPressedDispatcher().onBackPressed(); + } + } + }); } private void showAppAccountNotFoundAlertDialog(NextcloudFilesAppAccountNotFoundException e) { @@ -802,17 +817,6 @@ public void onNoteFavoriteClick(int position, View view) { }}); } - @Override - public void onBackPressed() { - if (activityBinding.searchToolbar.getVisibility() == VISIBLE) { - updateToolbars(false); - } else if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) { - binding.drawerLayout.closeDrawer(GravityCompat.START); - } else { - super.onBackPressed(); - } - } - private void updateToolbars(boolean enableSearch) { activityBinding.homeToolbar.setVisibility(enableSearch ? GONE : VISIBLE); activityBinding.searchToolbar.setVisibility(enableSearch ? VISIBLE : GONE);