Merge fixes and formatting

Author: maltaisn

calcdialog/src/main/java/com/maltaisn/calcdialog/CalcPresenter.java

@@ -17,7 +17,6 @@
 package com.maltaisn.calcdialog;
 
 import android.os.Bundle;
-import android.os.Parcelable;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -114,9 +113,7 @@ void detach() {
     }
 
     void writeStateToBundle(Bundle bundle) {
-        if (expression != null) {
-            bundle.putParcelable("expression", expression);
-        }
+        bundle.putParcelable("expression", expression);
         if (currentValue != null) {
             bundle.putSerializable("currentValue", currentValue);
         }
@@ -132,12 +129,9 @@ void writeStateToBundle(Bundle bundle) {
     }
 
     private void readStateFromBundle(Bundle bundle) {
-        //noinspection ConstantConditions
-        if (bundle.containsKey("expression")) {
-            Parcelable parcelable = bundle.getParcelable("expression");
-            if (parcelable != null){
-                this.expression = (Expression) parcelable;
-            }
+        Expression expr = bundle.getParcelable("expression");
+        if (expr != null) {
+            this.expression = expr;
         }
         if (bundle.containsKey("currentValue")) {
             currentValue = (BigDecimal) bundle.getSerializable("currentValue");

calcdialog/src/main/java/com/maltaisn/calcdialog/CalcSettings.java

@@ -20,8 +20,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.lang.UnsupportedOperationException;
-import java.lang.NullPointerException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
@@ -291,18 +289,18 @@ public boolean isOrderOfOperationsApplied() {
     private CalcSettings(Parcel in) {
         Bundle bundle = in.readBundle(getClass().getClassLoader());
         if (bundle != null) {
-
             requestCode = bundle.getInt("requestCode");
 
-            //noinspection ConstantConditions
             if (bundle.containsKey("nbFormat")) {
                 try {
-                    nbFormat = (NumberFormat) bundle.getSerializable("nbFormat");
+                    NumberFormat fmt = (NumberFormat) bundle.getSerializable("nbFormat");
+                    if (fmt != null) nbFormat = fmt;
                 } catch (NullPointerException npe) {
                     // Catch NPE exception on some Android 9 devices
                     // see https://stackoverflow.com/q/53541154/8941877
                 }
             }
+
             //noinspection ConstantConditions
             numpadLayout = (CalcNumpadLayout) bundle.getSerializable("numpadLayout");
             isExpressionShown = bundle.getBoolean("isExpressionShown");
@@ -311,12 +309,15 @@ private CalcSettings(Parcel in) {
             isSignBtnShown = bundle.getBoolean("isSignBtnShown");
             shouldEvaluateOnOperation = bundle.getBoolean("shouldEvaluateOnOperation");
 
-            if (bundle.containsKey("initialValue"))
+            if (bundle.containsKey("initialValue")) {
                 initialValue = (BigDecimal) bundle.getSerializable("initialValue");
-            if (bundle.containsKey("minValue"))
+            }
+            if (bundle.containsKey("minValue")) {
                 minValue = (BigDecimal) bundle.getSerializable("minValue");
-            if (bundle.containsKey("maxValue"))
+            }
+            if (bundle.containsKey("maxValue")) {
                 maxValue = (BigDecimal) bundle.getSerializable("maxValue");
+            }
             isOrderOfOperationsApplied = bundle.getBoolean("isOrderOfOperationsApplied");
         }
     }
@@ -326,9 +327,7 @@ public void writeToParcel(@NonNull Parcel out, int flags) {
         Bundle bundle = new Bundle();
 
         bundle.putInt("requestCode", requestCode);
-        if (nbFormat != null){
-            bundle.putSerializable("nbFormat", nbFormat);
-        }
+        bundle.putSerializable("nbFormat", nbFormat);
         bundle.putSerializable("numpadLayout", numpadLayout);
         bundle.putBoolean("isExpressionShown", isExpressionShown);
         bundle.putBoolean("isZeroShownWhenNoValue", isZeroShownWhenNoValue);
@@ -341,9 +340,9 @@ public void writeToParcel(@NonNull Parcel out, int flags) {
         if (maxValue != null) bundle.putSerializable("maxValue", maxValue);
         bundle.putBoolean("isOrderOfOperationsApplied", isOrderOfOperationsApplied);
 
-        try{
+        try {
             out.writeBundle(bundle);
-        } catch (UnsupportedOperationException uoe){
+        } catch (UnsupportedOperationException uoe) {
             // Workaround for issue https://issuetracker.google.com/issues/37043137
         }
     }