assert → if + throw

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / NewTransactionActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
index dca8d463263623469af193670079199f072b44c6..2327ce494d371263617a608d0628bcc5b5d4ecb9 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java
@@ -87,8 +87,24 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         }
     }
 
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(R.anim.dummy, R.anim.slide_out_right);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     public void save_transaction() {
-        mSave.setVisible(false);
+        if (mSave != null) mSave.setVisible(false);
         toggle_all_editing(false);
         progress.setVisibility(View.VISIBLE);
 
@@ -214,7 +230,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.new_transaction, menu);
         mSave = menu.findItem(R.id.action_submit_transaction);
-        assert mSave != null;
+        if (mSave == null) throw new AssertionError();
 
         return true;
     }
@@ -291,9 +307,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
         }
 
         if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) {
-            mSave.setVisible(true);
+            if (mSave != null) mSave.setVisible(true);
         } else {
-            mSave.setVisible(false);
+            if (mSave != null) mSave.setVisible(false);
         }
     }