Merge branch 'fastlane' into 'master'

fastlane

See merge request leap/bitmask_android!241

2 files changed, 4 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
index 68435fec..aa894cca 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java
@@ -424,11 +424,11 @@ public class NavigationDrawerFragment extends Fragment implements SharedPreferen
         Provider currentProvider = ProviderObservable.getInstance().getCurrentProvider();
         account.setText(currentProvider.getName());
         initManualGatewayEntry();
-    }
+    } 
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(PREFERRED_CITY)) {
+        if (key != null && key.equals(PREFERRED_CITY)) {
             initManualGatewayEntry();
         }
     }
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java b/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
index fc86fc0b..c7273613 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
@@ -48,10 +48,12 @@ public class MainButton extends RelativeLayout {
     public void updateState(boolean isOn, boolean isProcessing) {
         if (isProcessing) {
             button.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.button_circle_cancel));
+            button.setTag("button_circle_cancel");
         } else {
             button.setImageDrawable(
                     ContextCompat.getDrawable(getContext(),
                     isOn ? R.drawable.button_circle_stop : R.drawable.button_circle_start));
+            button.setTag(isOn ? "button_circle_stop" : "button_circle_start");
         }
     }
 }