Browse Source

Redirect to previous activity after login

pull/61/merge
Ezerous 6 years ago
parent
commit
61c3da68fb
No known key found for this signature in database GPG Key ID: 262B2954BBA319E3
  1. 1
      app/build.gradle
  2. 13
      app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
  3. 1
      app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java

1
app/build.gradle

@ -19,6 +19,7 @@ android {
buildTypes {
release {
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {

13
app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java

@ -40,12 +40,15 @@ public class LoginActivity extends BaseActivity {
/* --Graphics End-- */
private LoginTask loginTask;
private boolean initialRedirect;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
initialRedirect = getIntent().getBooleanExtra("REDIRECT", false);
PreferenceManager.setDefaultValues(this, R.xml.app_preferences_user, false);
//Variables initialization
@ -56,7 +59,6 @@ public class LoginActivity extends BaseActivity {
//Login button Click Event
btnLogin.setOnClickListener(view -> {
Timber.d("Login");
//Get username and password strings
username = inputUsername.getText().toString().trim();
@ -162,9 +164,12 @@ public class LoginActivity extends BaseActivity {
"Welcome, " + sessionManager.getUsername() + "!", Toast.LENGTH_LONG)
.show();
BaseApplication.getInstance().logFirebaseAnalyticsEvent(FirebaseAnalytics.Event.LOGIN, null);
//Go to main
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
startActivity(intent);
if(initialRedirect){
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
startActivity(intent);
} else
onBackPressed();
finish();
overridePendingTransition(R.anim.push_left_in, R.anim.push_left_out);
break;

1
app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java

@ -63,6 +63,7 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
if (sessionManager.isLoginScreenDefault()) {
//Go to login
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
intent.putExtra("REDIRECT", true);
startActivity(intent);
finish();
overridePendingTransition(R.anim.push_right_in, R.anim.push_right_out);

Loading…
Cancel
Save