mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add check for redirect to prevent welcome screen again

Browse source
This commit is contained in:
misaochan 2016-08-10 17:48:49 +12:00
parent 23aa3de53f
commit 20331c13dd
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -188,8 +188,11 @@ public class LoginActivity extends AccountAuthenticatorActivity {
});
if (savedInstanceState == null) {
Intent welcomeIntent = new Intent(this, WelcomeActivity.class);
startActivity(welcomeIntent);
Bundle extras = getIntent().getExtras();
if (extras == null || extras.getBoolean("redirected") == false ) {
Intent welcomeIntent = new Intent(this, WelcomeActivity.class);
startActivity(welcomeIntent);
}
}
}

1
app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
View file

@ -37,6 +37,7 @@ public class SignupActivity extends Activity {
// Signup success, so load LoginActivity again
Log.d("SignupActivity", "Overriding URL" + url);
Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
intent.putExtra("Redirected", true);
startActivity(intent);
return true;
} else {