summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java4
-rw-r--r--app/src/main/res/menu/f_log.xml4
2 files changed, 4 insertions, 4 deletions
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"/>