summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2018-02-25 15:51:14 +0100
committerFup Duck <fupduck@sacknagel.com>2018-02-25 15:51:14 +0100
commit03c1d39eccca1368fb160d6495f385846def5818 (patch)
tree658795aa32a83a1d31707f83712f249aba453c10 /app/src/main/java/se/leap
parent241b1c4491d2534bb0f79af21ba180b9b3d99446 (diff)
parentcf10c3dc481b154cd8f4d6996c9a80643b67c840 (diff)
Merge branch '8851_remove_menu' into 0xacab_0.9.8
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49
Diffstat (limited to 'app/src/main/java/se/leap')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index 3bf51a8c..75fffaf7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -369,12 +369,6 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
}
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.configuration_wizard_activity, menu);
- return true;
- }
-
public class ProviderAPIBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {