Merge pull request #592 from commons-app/prehackMainActivityIsLoginActivity

Switch the main activity to be the LoginActivity

Author: misaochan

app/src/main/AndroidManifest.xml

@@ -31,6 +31,10 @@
         <activity
             android:name=".auth.LoginActivity"
             >
+            <intent-filter>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
         </activity>
         <activity
             android:name=".WelcomeActivity"
@@ -66,10 +70,6 @@
                 android:icon="@drawable/ic_launcher"
                 android:label="@string/app_name"
                  >
-            <intent-filter>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <action android:name="android.intent.action.MAIN"/>
-             </intent-filter>
         </activity>
         <activity
             android:name=".settings.SettingsActivity"

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -166,7 +166,10 @@ public void putBitmap(String key, Bitmap bitmap) {
     public MWApi getApi() {
         return api;
     }
-    
+
+    /**
+     * @return Accout|null
+     */
     public Account getCurrentAccount() {
         if(currentAccount == null) {
             AccountManager accountManager = AccountManager.get(this);

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

@@ -17,10 +17,8 @@
 import android.widget.TextView;
 
 import android.widget.Toast;
-import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.WelcomeActivity;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.contributions.ContributionsActivity;
 import timber.log.Timber;
 
 
@@ -36,10 +34,14 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     EditText twoFactorEdit;
     ProgressDialog progressDialog;
 
+    private CommonsApplication app;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        app = (CommonsApplication) getApplicationContext();
+
         setContentView(R.layout.activity_login);
         final LoginActivity that = this;
 
@@ -116,6 +118,9 @@ protected void onResume() {
             this.startWelcomeIntent();
             prefs.edit().putBoolean("firstrun", false).apply();
         }
+        if (app.getCurrentAccount() != null) {
+            startMainActivity();
+        }
     }
 
     private void startWelcomeIntent() {
@@ -208,4 +213,10 @@ public void emptySensitiveEditFields() {
         twoFactorEdit.setText("");
     }
 
+    public void startMainActivity() {
+        Intent intent = new Intent(this, ContributionsActivity.class);
+        startActivity(intent);
+        finish();
+    }
+
 }

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

@@ -9,7 +9,6 @@
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.EventLog;
 import fr.free.nrw.commons.R;
-import fr.free.nrw.commons.contributions.ContributionsActivity;
 import timber.log.Timber;
 
 import java.io.IOException;
@@ -90,10 +89,7 @@ private void handlePassResult() {
         }
 
         AccountUtil.createAccount( response, username, password );
-
-        Intent intent = new Intent(loginActivity, ContributionsActivity.class);
-        loginActivity.startActivity(intent);
-        loginActivity.finish();
+        loginActivity.startMainActivity();
     }
 
     /**