diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 16:05:39 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 16:05:39 +0100 |
| commit | 0fac81767d2d48a5fe28c29e4ca6c4742fe62637 (patch) | |
| tree | 4fcc47118f63bd5d5dcde5803fd3703df55c1bfc /app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | |
| parent | 0bf176d8e925c71be7853c67f7c8b57d58df0ce3 (diff) | |
| parent | 45065d30e0f2c61ca654587bab765959fdf4931f (diff) | |
Merge branch '0xacab_0.9.8' into 8865_cancel_without_internet
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java | 6 |
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) { |