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 e94d30973..77eb54435 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 @@ -21,10 +21,6 @@ import androidx.activity.OnBackPressedCallback; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowCompat; -import androidx.core.view.WindowInsetsCompat; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceManager; @@ -108,7 +104,6 @@ protected void onCreate(final Bundle savedInstanceState) { setSupportActionBar(binding.toolbar); binding.toolbar.setOnClickListener((v) -> fragment.showEditTitleDialog()); - setImeInsets(); getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) { @Override @@ -120,33 +115,6 @@ public void handleOnBackPressed() { }); } - private void setImeInsets() { - final var window = getWindow(); - if (window == null) { - return; - } - - WindowCompat.setDecorFitsSystemWindows(window, false); - - final var decorView = window.getDecorView(); - ViewCompat.setOnApplyWindowInsetsListener(decorView, (v, insets) -> { - Insets imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime()); - Insets navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars()); - - // Apply bottom padding when keyboard is shown - int bottomPadding = Math.max(imeInsets.bottom, navBarInsets.bottom); - - v.setPadding( - v.getPaddingLeft(), - v.getPaddingTop(), - v.getPaddingRight(), - bottomPadding - ); - - return insets; - }); - } - @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); diff --git a/build.gradle b/build.gradle index 85903d40a..e5e22a34c 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { commonsVersion = '2.4.1' androidCommonsVersion = '1.1.1' nextcloudAndroidCommonLib = "0.34.0" - singleSignOnVersion = "1.3.4" + singleSignOnVersion = "5bbe3739d2" } repositories { mavenCentral() diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6a8b72a2c..9ed273835 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -30,6 +30,7 @@ + @@ -181,8 +182,6 @@ - @@ -331,6 +330,8 @@ + + @@ -3078,12 +3079,6 @@ - - - - - @@ -3786,12 +3781,6 @@ - - - - - @@ -14018,6 +14007,14 @@ + + + + + + + + @@ -16221,12 +16218,6 @@ - - - - - @@ -18295,6 +18286,11 @@ + + + + +