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

Fix NPE and comments

Browse source
This commit is contained in:
misaochan 2016-08-13 17:37:42 +12:00
parent 61d1963301
commit fa91b09b5b
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,19 +75,25 @@ public class LoginActivity extends AccountAuthenticatorActivity {
boolean accountCreated = AccountManager.get(context).addAccountExplicitly(account, password, null); boolean accountCreated = AccountManager.get(context).addAccountExplicitly(account, password, null);
Bundle extras = context.getIntent().getExtras(); Bundle extras = context.getIntent().getExtras();
if (extras != null) { if (extras != null) {
Log.d("LoginActivity", "Bundle of extras: " + extras.toString());
if (accountCreated) { // Pass the new account back to the account manager if (accountCreated) { // Pass the new account back to the account manager
AccountAuthenticatorResponse response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE); AccountAuthenticatorResponse response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
Bundle authResult = new Bundle(); Bundle authResult = new Bundle();
authResult.putString(AccountManager.KEY_ACCOUNT_NAME, username); authResult.putString(AccountManager.KEY_ACCOUNT_NAME, username);
authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE); authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE);
//FIXME: NPE here sometimes, otherwise goes to Signup screen upon successful login...
if (response != null) {
response.onResult(authResult); response.onResult(authResult);
} }
} }
}
// FIXME: If the user turns it off, it shouldn't be auto turned back on // FIXME: If the user turns it off, it shouldn't be auto turned back on
ContentResolver.setSyncAutomatically(account, ContributionsContentProvider.AUTHORITY, true); // Enable sync by default! ContentResolver.setSyncAutomatically(account, ContributionsContentProvider.AUTHORITY, true); // Enable sync by default!
ContentResolver.setSyncAutomatically(account, ModificationsContentProvider.AUTHORITY, true); // Enable sync by default! ContentResolver.setSyncAutomatically(account, ModificationsContentProvider.AUTHORITY, true); // Enable sync by default!
//FIXME: This is taking users back to SignupActivity
context.finish(); context.finish();
} else { } else {
int response; int response;

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

@ -59,6 +59,7 @@ public class SignupActivity extends Activity {
} }
} }
/*
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (otherPage == true) { if (otherPage == true) {
@ -72,4 +73,5 @@ public class SignupActivity extends Activity {
startActivity(intent); startActivity(intent);
} }
} }
*/
} }