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=90f88685c5a3696ef090aa578a375f110318af0f;hp=e079399eb641e80f9a8bd149f662974d9fa6a5f2;hb=c4a6ffc68ab1d6edb3a6eaeb0ef123e5fa8f6984;hpb=11c8dff16901782f69287854cb4788ddf8d932c2 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 e079399e..90f88685 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 @@ -37,6 +37,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.Toast; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.RefreshDescriptionsTask; @@ -109,7 +110,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 = @@ -220,12 +221,6 @@ public class MainActivity extends AppCompatActivity { 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); @@ -333,11 +328,15 @@ public class MainActivity extends AppCompatActivity { if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); bTransactionListCancelDownload.setEnabled(false); } - public void onRetrieveDone(boolean success) { + public void onRetrieveDone(String error) { progressLayout.setVisibility(View.GONE); - updateLastUpdateTextFromDB(); - new RefreshDescriptionsTask().execute(); + if (error == null) { + updateLastUpdateTextFromDB(); + + new RefreshDescriptionsTask().execute(); + } + else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } public void onRetrieveStart() { progressBar.setIndeterminate(true);