remove unused members

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java

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 488dbeae02d537405d56089f81720949a1ea9b78..1ccdf3cae03ec113ab375a9cd23d0206dfa4960a 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -45,7 +45,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.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;
 import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
 import net.ktnx.mobileledger.utils.MLDB;


@@ -55,10 +54,7 @@ import java.text.DateFormat;
 import java.util.Date;
 
 public class MainActivity extends AppCompatActivity {
 import java.util.Date;
 
 public class MainActivity extends AppCompatActivity {

-    public MobileLedgerListFragment currentFragment = null;

     DrawerLayout drawer;
     DrawerLayout drawer;

-    private AccountSummaryFragment accountSummaryFragment;
-    private TransactionListFragment transactionListFragment;

     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;


@@ -110,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
         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 =
 
         try {
             PackageInfo pi =


@@ -170,10 +166,9 @@ public class MainActivity extends AppCompatActivity {
         });
     }
     private void setupProfile() {
         });
     }
     private void setupProfile() {

-        Data.profiles.setList(MobileLedgerProfile.loadAllFromDB());
-        MobileLedgerProfile profile = null;
-

         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);

+        MobileLedgerProfile profile;
+

         if (profileUUID == null) {
             if (Data.profiles.isEmpty()) {
                 Data.profiles.setList(MobileLedgerProfile.createInitialProfileList());
         if (profileUUID == null) {
             if (Data.profiles.isEmpty()) {
                 Data.profiles.setList(MobileLedgerProfile.createInitialProfileList());


@@ -196,9 +191,10 @@ public class MainActivity extends AppCompatActivity {
                 editor.clear();
                 editor.apply();
             }
                 editor.clear();
                 editor.apply();
             }

+            else profile = Data.profiles.get(0);

         }
         else {
         }
         else {

-            profile = MobileLedgerProfile.loadUUIDFromDB(profileUUID);
+            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);

         }
 
         if (profile == null) profile = Data.profiles.get(0);
         }
 
         if (profile == null) profile = Data.profiles.get(0);