X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=1e4b4460a505e2ac18a2ecdc97f9ad3ab990b0aa;hp=37e6fd23d06cfadeba2dcae06d9720d87821ec24;hb=64dd42bfbc26756163d78bd4028f84993c22b018;hpb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index 37e6fd23..1e4b4460 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -18,7 +18,6 @@
 package net.ktnx.mobileledger.ui.activity;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.os.Bundle;
@@ -45,7 +44,6 @@ import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
 import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
 import net.ktnx.mobileledger.utils.MLDB;
@@ -55,10 +53,7 @@ import java.text.DateFormat;
 import java.util.Date;
 
 public class MainActivity extends AppCompatActivity {
-    public MobileLedgerListFragment currentFragment = null;
     DrawerLayout drawer;
-    private AccountSummaryFragment accountSummaryFragment;
-    private TransactionListFragment transactionListFragment;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -98,11 +93,10 @@ public class MainActivity extends AppCompatActivity {
             runOnUiThread(() -> {
                 if (profile == null) setTitle(R.string.app_name);
                 else setTitle(profile.getName());
+                updateLastUpdateTextFromDB();
             });
         });
 
-        setupProfile();
-
         drawer = findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle =
                 new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
@@ -110,7 +104,7 @@ public class MainActivity extends AppCompatActivity {
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        android.widget.TextView ver = drawer.findViewById(R.id.drawer_version_text);
+        TextView ver = drawer.findViewById(R.id.drawer_version_text);
 
         try {
             PackageInfo pi =
@@ -168,65 +162,48 @@ public class MainActivity extends AppCompatActivity {
                 }
             });
         });
+
+        findViewById(R.id.btn_no_profiles_add).setOnClickListener(v -> startAddProfileActivity());
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        setupProfile();
+    }
+    private void startAddProfileActivity() {
+        Intent intent = new Intent(this, ProfileListActivity.class);
+        Bundle args = new Bundle();
+        args.putInt(ProfileListActivity.ARG_ACTION, ProfileListActivity.ACTION_EDIT_PROFILE);
+        args.putInt(ProfileListActivity.ARG_PROFILE_INDEX, ProfileListActivity.PROFILE_INDEX_NONE);
+        intent.putExtras(args);
+        startActivity(intent, args);
     }
     private void setupProfile() {
-        Data.profiles.setList(MobileLedgerProfile.loadAllFromDB());
-        MobileLedgerProfile profile = null;
-
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        if (profileUUID == null) {
-            if (Data.profiles.isEmpty()) {
-                Data.profiles.setList(MobileLedgerProfile.createInitialProfileList());
-                profile = Data.profiles.get(0);
-
-                SharedPreferences backend = getSharedPreferences("backend", MODE_PRIVATE);
-                Log.d("profiles", "Migrating from preferences to profiles");
-                // migration to multiple profiles
-                if (profile.getUrl().isEmpty()) {
-                    // no legacy config
-                    Intent intent = new Intent(this, ProfileListActivity.class);
-                    startActivity(intent);
-                }
-                profile.setUrl(backend.getString("backend_url", ""));
-                profile.setAuthEnabled(backend.getBoolean("backend_use_http_auth", false));
-                profile.setAuthUserName(backend.getString("backend_auth_user", null));
-                profile.setAuthPassword(backend.getString("backend_auth_password", null));
-                profile.storeInDB();
-                SharedPreferences.Editor editor = backend.edit();
-                editor.clear();
-                editor.apply();
-            }
-        }
-        else {
-            profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID);
+        MobileLedgerProfile profile;
+
+        profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+
+        if (Data.profiles.getList().isEmpty()) {
+            findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
+            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            return;
         }
 
+        findViewById(R.id.pager_layout).setVisibility(View.VISIBLE);
+        findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+
         if (profile == null) profile = Data.profiles.get(0);
 
         if (profile == null) throw new AssertionError("profile must have a value");
 
         Data.setCurrentProfile(profile);
-
-        if (profile.getUrl().isEmpty()) {
-            Intent intent = new Intent(this, ProfileListActivity.class);
-            Bundle args = new Bundle();
-            args.putInt(ProfileListActivity.ARG_ACTION, ProfileListActivity.ACTION_EDIT_PROFILE);
-            args.putInt(ProfileListActivity.ARG_PROFILE_INDEX, 0);
-            intent.putExtras(args);
-            startActivity(intent, args);
-        }
     }
     public void fabNewTransactionClicked(View view) {
         Intent intent = new Intent(this, NewTransactionActivity.class);
         startActivity(intent);
         overridePendingTransition(R.anim.slide_in_right, R.anim.dummy);
     }
-
-    public void navExitClicked(View view) {
-        Log.w("app", "exiting");
-        finish();
-    }
-
     public void navSettingsClicked(View view) {
         Intent intent = new Intent(this, SettingsActivity.class);
         startActivity(intent);
@@ -312,7 +289,9 @@ public class MainActivity extends AppCompatActivity {
     }
     public void updateLastUpdateTextFromDB() {
         {
-            long last_update = Data.profile.get().getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
+            final MobileLedgerProfile profile = Data.profile.get();
+            long last_update =
+                    (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0;
 
             Log.d("transactions", String.format("Last update = %d", last_update));
             if (last_update == 0) {
@@ -324,6 +303,8 @@ public class MainActivity extends AppCompatActivity {
         }
     }
     public void scheduleTransactionListRetrieval() {
+        if (Data.profile.get() == null) return;
+
         retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
 
         retrieveTransactionsTask.execute();
@@ -381,7 +362,7 @@ public class MainActivity extends AppCompatActivity {
 
         @Override
         public Fragment getItem(int position) {
-            Log.d("main", String.format("Switching to gragment %d", position));
+            Log.d("main", String.format("Switching to fragment %d", position));
             switch (position) {
                 case 0:
                     return new AccountSummaryFragment();