Fix NPE and comments

Author: misaochan

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

@@ -75,19 +75,25 @@ protected void onPostExecute(String result) {
                 boolean accountCreated = AccountManager.get(context).addAccountExplicitly(account, password, null);
 
                 Bundle extras = context.getIntent().getExtras();
+
+
                 if (extras != null) {
+                    Log.d("LoginActivity", "Bundle of extras: " + extras.toString());
                     if (accountCreated) { // Pass the new account back to the account manager
                         AccountAuthenticatorResponse response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
                         Bundle authResult = new Bundle();
                         authResult.putString(AccountManager.KEY_ACCOUNT_NAME, username);
                         authResult.putString(AccountManager.KEY_ACCOUNT_TYPE, WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE);
-                        //FIXME: NPE here sometimes, otherwise goes to Signup screen upon successful login...
-                        response.onResult(authResult);
+
+                        if (response != null) {
+                            response.onResult(authResult);
+                        }
                     }
                 }
                 // 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, ModificationsContentProvider.AUTHORITY, true); // Enable sync by default!
+                //FIXME: This is taking users back to SignupActivity
                 context.finish();
             } else {
                 int response;

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

@@ -59,6 +59,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         }
     }
 
+    /*
     @Override
     public void onBackPressed() {
         if (otherPage == true) {
@@ -72,4 +73,5 @@ public void onBackPressed() {
             startActivity(intent);
         }
     }
+    */
 }