summaryrefslogtreecommitdiff
path: root/app/src/insecure/java/se/leap/bitmaskclient
diff options
context:
space:
mode:
authorlalottacontinua <loddatio@posteo.de>2018-06-18 21:15:15 +0200
committerlalottacontinua <loddatio@posteo.de>2018-06-18 21:15:15 +0200
commit1a34cc1e3ebf152505ed591787a7778744020bbd (patch)
tree4dc3054b63ef53b32ba0591aca8c317b8cd2cd8d /app/src/insecure/java/se/leap/bitmaskclient
parent2fbf5a2cadabb503306af4a59c1f98596784e488 (diff)
parent77879cf10f7857b95c968446f5ce9e0437bceb0f (diff)
solved merge conflict
Diffstat (limited to 'app/src/insecure/java/se/leap/bitmaskclient')
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java16
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();