diff options
author | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-06-14 21:12:20 +0200 |
commit | 452b42326167b97081bc386dbb8fd800075d1269 (patch) | |
tree | ca14573e065748fe6a2aad5a096c2d713e0c6e39 /app/src/insecure/java/se/leap/bitmaskclient | |
parent | dc4e74975afcba8a694ec23666c538dc761277b1 (diff) | |
parent | 117ec679f83e67762552e2c16310a1f57a9b9d88 (diff) |
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
Diffstat (limited to 'app/src/insecure/java/se/leap/bitmaskclient')
-rw-r--r-- | app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java index 02f76240..67565d70 100644 --- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java +++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java @@ -50,25 +50,9 @@ public class ProviderListActivity extends ProviderListBaseActivity { preferences.edit().remove(ProviderItem.DANGER_ON).apply(); } - /** - * Open the new provider dialog with data - */ - public void addAndSelectNewProvider(String mainUrl, boolean danger_on) { - FragmentTransaction fragment_transaction = fragmentManager.removePreviousFragment(NewProviderDialog.TAG); - - DialogFragment newFragment = new NewProviderDialog(); - Bundle data = new Bundle(); - data.putString(Provider.MAIN_URL, mainUrl); - data.putBoolean(ProviderItem.DANGER_ON, danger_on); - newFragment.setArguments(data); - newFragment.show(fragment_transaction, NewProviderDialog.TAG); - } - public void showAndSelectProvider(String provider_main_url, boolean danger_on) { try { provider = new Provider(new URL((provider_main_url))); - adapter.add(provider); - adapter.saveProviders(); autoSelectProvider(provider, danger_on); } catch (MalformedURLException e) { e.printStackTrace(); |