From 1deb8910b037abf8be2bf94de5e0b8775fb147c3 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sun, 13 Aug 2017 19:55:53 +0200 Subject: [PATCH] Don't allow back button presses in AuthActivity --- app/src/main/java/me/impy/aegis/AuthActivity.java | 5 +++++ app/src/main/java/me/impy/aegis/IntroActivity.java | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/impy/aegis/AuthActivity.java b/app/src/main/java/me/impy/aegis/AuthActivity.java index d0cf80a3..b1322a67 100644 --- a/app/src/main/java/me/impy/aegis/AuthActivity.java +++ b/app/src/main/java/me/impy/aegis/AuthActivity.java @@ -62,6 +62,11 @@ public class AuthActivity extends AppCompatActivity { }); } + @Override + public void onBackPressed() { + // ignore back button presses + } + private char[] getPassword(boolean clear) { char[] password = getEditTextChars(textPassword); if (clear) { diff --git a/app/src/main/java/me/impy/aegis/IntroActivity.java b/app/src/main/java/me/impy/aegis/IntroActivity.java index 79a15193..d12aea47 100644 --- a/app/src/main/java/me/impy/aegis/IntroActivity.java +++ b/app/src/main/java/me/impy/aegis/IntroActivity.java @@ -34,8 +34,6 @@ public class IntroActivity extends AppIntro { showSkipButton(false); //showPagerIndicator(false); setGoBackLock(true); - // TODO: remove this once github.com/apl-devs/AppIntro/issues/347 is fixed - setSwipeLock(true); SliderPage homeSliderPage = new SliderPage(); homeSliderPage.setTitle("Welcome");