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

Change finish() to manually load ContributionsActivity

Browse source
This commit is contained in:
misaochan 2016-08-13 18:43:38 +12:00
parent 9242c2144f
commit 3c895e3473
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.EventLog; import fr.free.nrw.commons.EventLog;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.WelcomeActivity; import fr.free.nrw.commons.WelcomeActivity;
import fr.free.nrw.commons.contributions.ContributionsActivity;
import fr.free.nrw.commons.contributions.ContributionsContentProvider; import fr.free.nrw.commons.contributions.ContributionsContentProvider;
import fr.free.nrw.commons.modifications.ModificationsContentProvider; import fr.free.nrw.commons.modifications.ModificationsContentProvider;
@ -95,7 +96,10 @@ public class LoginActivity extends AccountAuthenticatorActivity {
ContentResolver.setSyncAutomatically(account, ModificationsContentProvider.AUTHORITY, true); // Enable sync by default! ContentResolver.setSyncAutomatically(account, ModificationsContentProvider.AUTHORITY, true); // Enable sync by default!
//FIXME: This is supposed to return user to ContributionsActivity (launcher activity), but is instead taking users back to SignupActivity //FIXME: This is supposed to return user to ContributionsActivity (launcher activity), but is instead taking users back to SignupActivity
context.finish(); //context.finish();
Intent intent = new Intent(context, ContributionsActivity.class);
startActivity(intent);
} else { } else {
int response; int response;
@ -246,7 +250,8 @@ public class LoginActivity extends AccountAuthenticatorActivity {
//Called when Sign Up button is clicked //Called when Sign Up button is clicked
public void signUp(View view) { public void signUp(View view) {
Intent intent = new Intent(this, SignupActivity.class); Intent intent = new Intent(this, SignupActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY); // FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
//intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
startActivity(intent); startActivity(intent);
} }
} }