diff options
| -rw-r--r-- | app/build.gradle | 3 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java | 4 | ||||
| -rw-r--r-- | app/src/main/res/menu/f_log.xml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle index 6c1bf394..1fa344b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -344,7 +344,6 @@ android { * normalProductionFatDebug -> Bitmask development build, includes all ABIS * customProductionFatwebDebug -> branded development build, includes all ABIs, for distribution through a download page * normalProductionFatWebDebug -> Bitmask development build, includes all ABIS, for distribution through a download page - * customInsecureFatDebug -> branded development build, doesn't checks certificates (for test server setup w/o valid certificates), includes all ABIs * normalInsecureFatDebug -> Bitmask development build, doesn't checks certificates (for test server setup w/o valid certificates), includes all ABIs * * Branded Releases: @@ -377,10 +376,12 @@ android { def buildTypeName = variant.buildType.name // flavorDimensions "branding" -> 0, "implementation" -> 1, "abi" -> 2 def supportsSplitApk = variant.flavors[0].splitApk + def branding = variant.flavors[0].name // To check for a certain build type, use variant.buildType.name == "<buildType>" if (((names.contains("insecure") && !names.contains("fat")) || (names.contains("insecure") && buildTypeName.contains("beta")) || (names.contains("insecure") && buildTypeName.contains("release")) || + (names.contains("insecure") && branding.contains("custom")) || (buildTypeName.contains("debug") && !(names.contains("fatweb") || names.contains("fat"))) || (names.contains("fatweb") && buildTypeName.contains("beta")) || (!supportsSplitApk && !names.contains("fat"))) diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java index cc6ff149..4b7d22fc 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java @@ -38,7 +38,7 @@ import se.leap.bitmaskclient.providersetup.activities.ProviderListBaseActivity; */ public class ProviderApiSetupBroadcastReceiver extends BroadcastReceiver { - private WeakReference<ProviderSetupInterface> setupInterfaceRef; + private final WeakReference<ProviderSetupInterface> setupInterfaceRef; public ProviderApiSetupBroadcastReceiver(ProviderSetupInterface setupInterface) { this.setupInterfaceRef = new WeakReference<>(setupInterface); @@ -62,7 +62,7 @@ public class ProviderApiSetupBroadcastReceiver extends BroadcastReceiver { Provider handledProvider = resultData.getParcelable(Constants.PROVIDER_KEY); if (handledProvider != null && setupInterface.getProvider() != null && - handledProvider.getDomain().equalsIgnoreCase(setupInterface.getProvider().getDomain())) { + handledProvider.getMainUrlString().equalsIgnoreCase(setupInterface.getProvider().getMainUrlString())) { switch (resultCode) { case ProviderAPI.PROVIDER_OK: setupInterface.handleProviderSetUp(handledProvider); diff --git a/app/src/main/res/menu/f_log.xml b/app/src/main/res/menu/f_log.xml index d30b13cb..3a1d5178 100644 --- a/app/src/main/res/menu/f_log.xml +++ b/app/src/main/res/menu/f_log.xml @@ -18,13 +18,13 @@ <item android:id="@+id/clearlog" android:icon="@drawable/ic_menu_delete" - app:showAsAction="ifRoom" + app:showAsAction="never" android:title="@string/clear_log" android:titleCondensed="@string/clear"/> <item android:id="@+id/send" android:icon="@drawable/ic_menu_share" - app:showAsAction="ifRoom" + app:showAsAction="never" android:title="@string/send_logfile" android:titleCondensed="@string/send"/> |