X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=aba83f0551d04b04e65f1d3dc3e0af58c5b4e515;hb=8098a8b37a4331b9faf6cf50a51a0d7aa9677421;hp=c4d5c24a9f38016ac413373fa8e3eb5c74827874;hpb=d63a611dce420b30fa0c0711eea1d02603945a43;p=mobile-ledger.git

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 c4d5c24a..aba83f05 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
@@ -347,13 +347,13 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
                 continue;
 
             final ShortcutInfo.Builder builder =
-                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid());
+                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getId());
             ShortcutInfo si = builder.setShortLabel(p.getName())
                                      .setIcon(Icon.createWithResource(this,
                                              R.drawable.thick_plus_icon))
                                      .setIntent(new Intent(Intent.ACTION_VIEW, null, this,
-                                             NewTransactionActivity.class).putExtra("profile_uuid",
-                                             p.getUuid()))
+                                             NewTransactionActivity.class).putExtra("profile_id",
+                                             p.getId()))
                                      .setRank(i)
                                      .build();
             shortcuts.add(si);
@@ -424,7 +424,6 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
         mainModel.clearTransactions();
 
         if (haveProfile) {
-            mainModel.scheduleAccountListReload();
             Logger.debug("transactions", "requesting list reload");
             mainModel.scheduleTransactionListReload();
 
@@ -452,6 +451,7 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
         Data.lastUpdateAccountCount.removeObservers(this);
         Data.lastUpdateDate.removeObservers(this);
 
+        Logger.debug("MainActivity", "profileThemeChanged(): recreating activity");
         recreate();
     }
     public void fabNewTransactionClicked(View view) {
@@ -541,16 +541,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
         Integer transactionCount = Data.lastUpdateTransactionCount.getValue();
         Date lastUpdate = Data.lastUpdateDate.getValue();
         if (lastUpdate == null) {
-            Data.lastTransactionsUpdateText.set("----");
-            Data.lastAccountsUpdateText.set("----");
+            Data.lastTransactionsUpdateText.setValue("----");
+            Data.lastAccountsUpdateText.setValue("----");
         }
         else {
-            Data.lastTransactionsUpdateText.set(
+            Data.lastTransactionsUpdateText.setValue(
                     String.format(Objects.requireNonNull(Data.locale.getValue()),
                             templateForTransactions,
                             transactionCount == null ? 0 : transactionCount,
                             DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags)));
-            Data.lastAccountsUpdateText.set(
+            Data.lastAccountsUpdateText.setValue(
                     String.format(Objects.requireNonNull(Data.locale.getValue()),
                             templateForAccounts, accountCount == null ? 0 : accountCount,
                             DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags)));