From f62e666652ce286183f244449818eb9f692c8bb7 Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Wed, 21 Oct 2020 19:31:24 -0700 Subject: [PATCH] User can no longer reaccess login-required pages through the back button --- .../app/src/main/java/com/example/listify/AuthManager.java | 2 ++ .../src/main/java/com/example/listify/MainActivity.java | 1 + .../java/com/example/listify/ui/ForgotPasswordPage.java | 7 +++++++ .../src/main/java/com/example/listify/ui/LoginPage.java | 6 ++++++ .../src/main/java/com/example/listify/ui/SignupPage.java | 6 ++++++ .../java/com/example/listify/ui/home/HomeFragment.java | 1 + 6 files changed, 23 insertions(+) diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java index bc3164c..5a02019 100644 --- a/Listify/app/src/main/java/com/example/listify/AuthManager.java +++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java @@ -156,6 +156,8 @@ public class AuthManager { public void signOutUser() throws AuthException { authSession = null; + email = null; + password = null; waiting = true; Amplify.Auth.signOut(this::signOutSuccess, error -> setAuthError(error)); throwIfAuthError(); diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java index ea01bac..dd6d2bc 100644 --- a/Listify/app/src/main/java/com/example/listify/MainActivity.java +++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java @@ -210,6 +210,7 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF am.signOutUser(); Intent intent = new Intent(MainActivity.this, com.example.listify.ui.LoginPage.class); startActivity(intent); + finish(); } catch (Exception e) { Log.i("Authentication", e.toString()); diff --git a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java index f30833b..7f2e129 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java @@ -8,6 +8,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; +import com.example.listify.MainActivity; import com.example.listify.R; import static com.example.listify.MainActivity.am; @@ -25,6 +26,11 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co super.onCreate(savedInstanceState); setContentView(R.layout.activity_forgotpswd); + if(am.getEmail() != null) { + Intent intent = new Intent(ForgotPasswordPage.this, MainActivity.class); + startActivity(intent); + } + button1 = (Button) findViewById(R.id.button1); button1.setOnClickListener(new View.OnClickListener() { @Override @@ -70,6 +76,7 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co am.confirmPasswordReset(newPassword, code); Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class); startActivity(intent); + finish(); } catch (Exception e) { Log.i("Authentication", e.toString()); diff --git a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java index 65e3ce0..3754b52 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java @@ -25,6 +25,11 @@ public class LoginPage extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); + if(am.getEmail() != null) { + Intent intent = new Intent(LoginPage.this, MainActivity.class); + startActivity(intent); + } + button1 = (Button) findViewById(R.id.button1); button1.setOnClickListener(new View.OnClickListener() { @Override @@ -57,6 +62,7 @@ public class LoginPage extends AppCompatActivity { am.signIn(email, password); Intent intent = new Intent(LoginPage.this, MainActivity.class); startActivity(intent); + finish(); } catch(Exception e) { Log.i("Authentication", e.toString()); diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java index a5400c7..29e8df3 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java +++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java @@ -28,6 +28,11 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog super.onCreate(savedInstanceState); setContentView(R.layout.activity_signup); + if(am.getEmail() != null) { + Intent intent = new Intent(SignupPage.this, MainActivity.class); + startActivity(intent); + } + button1 = (Button) findViewById(R.id.button1); button1.setOnClickListener(new View.OnClickListener() { @Override @@ -83,6 +88,7 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog am.signIn(email, password); Intent intent = new Intent(SignupPage.this, MainActivity.class); startActivity(intent); + finish(); } catch (Exception e) { Log.i("Authentication", e.toString()); diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java index 28178c9..fbd75d6 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java @@ -60,6 +60,7 @@ public class HomeFragment extends Fragment { am.deleteUser(requestor); Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class); startActivity(intent); + getActivity().finish(); } catch (Exception e) { Log.i("Authentication", e.toString());