Merge pull request #225 from coolo/remove_laucher

Remove laucher activity

app/src/main/AndroidManifest.xml

@@ -34,9 +34,10 @@
         android:largeHeap="true"
         android:fullBackupContent="false">
         <activity
-            android:name=".ui.launcher.LauncherActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Piwigo.Login">
+            android:name=".ui.main.MainActivity"
+            android:label="@string/title_activity_main"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Piwigo.NavDrawer">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -52,11 +53,6 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.main.MainActivity"
-            android:label="@string/title_activity_main"
-            android:launchMode="singleTask"
-            android:theme="@style/Theme.Piwigo.NavDrawer" />
         <activity
             android:name=".ui.account.ManageAccountsActivity"
             android:label="@string/title_activity_accounts"

app/src/main/java/org/piwigo/internal/di/module/AndroidInjectorModule.java

@@ -24,7 +24,6 @@
 import org.piwigo.internal.di.scope.PerFragment;
 import org.piwigo.internal.di.scope.PerService;
 import org.piwigo.ui.account.ManageAccountsActivity;
-import org.piwigo.ui.launcher.LauncherActivity;
 import org.piwigo.ui.login.LoginActivity;
 import org.piwigo.ui.login.LoginActivityModule;
 import org.piwigo.ui.main.AlbumsFragment;
@@ -41,8 +40,6 @@
 @Module(includes = AndroidSupportInjectionModule.class)
 public abstract class AndroidInjectorModule {
 
-    @PerActivity @ContributesAndroidInjector() abstract LauncherActivity launcherActivity();
-
     @PerActivity @ContributesAndroidInjector(modules = LoginActivityModule.class) abstract LoginActivity loginActivity();
 
     @PerActivity @ContributesAndroidInjector(modules = MainActivityModule.class) abstract MainActivity mainActivity();

app/src/main/java/org/piwigo/ui/account/ManageAccountsActivity.java

@@ -139,11 +139,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 startActivity(editIntent);
                 break;
             case R.id.action_del_account:
+                Account account = userManager.getActiveAccount().getValue();
+                if (account != null) {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                        accountManager.removeAccount(userManager.getActiveAccount().getValue(), this, future -> userManager.refreshAccounts(), null);
+                        accountManager.removeAccount(account, this, future -> userManager.refreshAccounts(), null);
                     } else {
-                        accountManager.removeAccount(userManager.getActiveAccount().getValue(), future -> userManager.refreshAccounts(), null);
+                        accountManager.removeAccount(account, future -> userManager.refreshAccounts(), null);
                     }
+                }
                 break;
             case android.R.id.home:
                 NavUtils.navigateUpFromSameTask(this);

app/src/main/java/org/piwigo/ui/login/LoginActivity.java

@@ -45,6 +45,7 @@
 import org.piwigo.helper.DialogHelper;
 import org.piwigo.io.PiwigoLoginException;
 import org.piwigo.io.model.LoginResponse;
+import org.piwigo.ui.main.MainActivity;
 import org.piwigo.ui.shared.BaseActivity;
 
 import java.net.URI;
@@ -140,12 +141,20 @@ public void finish() {
             }
             authenticatorResponse = null;
         }
+
         super.finish();
     }
 
+    private void startMainActivity() {
+        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
+    }
+
     private void loginSuccess(LoginResponse response) {
         fabProgressCircle.hide();
         if (viewModel.isEditExisting()) {
+            startMainActivity();
             finish();
         } else if (userManager.userExists(response.url, response.username)) {
             Snackbar.make(binding.getRoot(), R.string.login_account_error, Snackbar.LENGTH_LONG)
@@ -154,6 +163,7 @@ private void loginSuccess(LoginResponse response) {
             Account account = userManager.createUser(response.url, response.statusResponse.result.username, response.password, response.pwgId, response.statusResponse.result.pwgToken);
             userManager.setActiveAccount(account);
             setResultIntent(account);
+            startMainActivity();
             finish();
         }
     }

app/src/main/java/org/piwigo/ui/main/MainActivity.java

@@ -27,6 +27,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.text.InputType;
@@ -68,6 +69,7 @@
 import org.piwigo.ui.settings.SettingsActivity;
 import org.piwigo.ui.shared.BaseActivity;
 
+
 import java.io.File;
 import java.util.ArrayList;
 
@@ -91,6 +93,7 @@
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasAndroidInjector;
+import rx.Subscriber;
 
 public class MainActivity extends BaseActivity implements HasAndroidInjector {
     private static final String TAG = MainActivity.class.getName();
@@ -106,6 +109,8 @@ public class MainActivity extends BaseActivity implements HasAndroidInjector {
     @Inject
     UserRepository userRepository;
 
+    private final Handler handler = new Handler();
+
     private MainViewModel viewModel;
 
     private Account currentAccount = null;
@@ -118,6 +123,15 @@ public class MainActivity extends BaseActivity implements HasAndroidInjector {
     private Observable.OnPropertyChangedCallback mDrawerCallBack;
     private ActivityMainBinding mBinding;
 
+    private boolean checkLoginRequired() {
+       if (!userManager.hasAccounts()) {
+            Intent intent = new Intent(this, LoginActivity.class);
+            startActivity(intent);
+            return true;
+       }
+       return false;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         AndroidInjection.inject(this);
@@ -154,6 +168,11 @@ public void onPropertyChanged(Observable sender, int propertyId) {
 
         snackProgressBarManager = new SnackProgressBarManager(findViewById(android.R.id.content), null);
 
+        if (checkLoginRequired()) {
+            finish();
+            return;
+        }
+
         if (!NetworkHelper.INSTANCE.hasInternet(this)) {
             EventBus.getDefault().post(new SnackbarShowEvent(getResources().getString(R.string.no_internet), Snackbar.LENGTH_INDEFINITE));
         }
@@ -188,7 +207,6 @@ public void onError(Throwable e) {
                     @Override
                     public void onNext(LoginResponse loginResponse) {
                         Log.i(TAG, "Login succeeded: " + loginResponse.pwgId + " token: " + loginResponse.statusResponse.result.pwgToken);
-                        // TODO: it is crazy to have this code here AND in LauncherActivity
                         userManager.setCookie(account, loginResponse.pwgId);
                         userManager.setToken(account, loginResponse.statusResponse.result.pwgToken);
                         userManager.setChunkSize(account, loginResponse.statusResponse.result.uploadFormChunkSize);

app/src/main/java/org/piwigo/ui/shared/BaseActivity.java

@@ -27,7 +27,6 @@
 
 public abstract class BaseActivity extends AppCompatActivity {
 
-    @Inject protected Navigator navigator;
     @Inject protected UserManager userManager;
     @Inject protected PreferencesRepository preferencesRepository;
 }