1 files changed, 47 insertions, 75 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
index ebfc1909..6738a6bb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java
@@ -1,7 +1,6 @@
 package se.leap.bitmaskclient;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.AppCompatTextView;
@@ -12,14 +11,10 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 
 import butterknife.InjectView;
 
-import static se.leap.bitmaskclient.Constants.PROVIDER_ALLOW_ANONYMOUS;
 import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
 import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
 
@@ -36,56 +31,58 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        provider = getIntent().getParcelableExtra(PROVIDER_KEY);
         setContentView(R.layout.a_provider_detail);
 
-        try {
-            JSONObject providerJson = new JSONObject(preferences.getString(Provider.KEY, ""));
-            setProviderHeaderText(ConfigHelper.getProviderName(preferences));
-            description.setText(ConfigHelper.getDescription(preferences));
+        if (provider == null) {
+            return;
+        }
 
-            // Show only the options allowed by the provider
-            ArrayList<String> optionsList = new ArrayList<>();
-            if (registrationAllowed(providerJson)) {
-                optionsList.add(getString(R.string.login_to_profile));
-                optionsList.add(getString(R.string.create_profile));
-            }
-            if (anonAllowed(providerJson)) {
-                optionsList.add(getString(R.string.use_anonymously_button));
-            }
 
-            options.setAdapter(new ArrayAdapter<>(
-                    this,
-                    R.layout.single_list_item,
-                    android.R.id.text1,
-                    optionsList.toArray(new String[optionsList.size()])
-            ));
-            options.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                @Override
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    String text = ((TextView) view).getText().toString();
-                    Intent intent;
-                    if (text.equals(getString(R.string.login_to_profile))) {
-                        Log.d(TAG, "login selected");
-                        intent = new Intent(getApplicationContext(), LoginActivity.class);
-                    } else if (text.equals(getString(R.string.create_profile))) {
-                        Log.d(TAG, "signup selected");
-                        intent = new Intent(getApplicationContext(), SignupActivity.class);
-                    } else {
-                        Log.d(TAG, "use anonymously selected");
-                        intent = new Intent();
-                        intent.putExtra(Provider.KEY, provider);
-                        setResult(RESULT_OK, intent);
-                        finish();
-                        return;
-                    }
-                    intent.putExtra(PROVIDER_KEY, provider);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-                    startActivityForResult(intent, REQUEST_CODE_CONFIGURE_LEAP);
-                }
-            });
-        } catch (JSONException e) {
-            // TODO show error and return
+        setProviderHeaderText(provider.getName());
+        description.setText(provider.getDescription());
+
+        // Show only the options allowed by the provider
+        ArrayList<String> optionsList = new ArrayList<>();
+        if (provider.allowsRegistered()) {
+            optionsList.add(getString(R.string.login_to_profile));
+            optionsList.add(getString(R.string.create_profile));
+        }
+        if (provider.allowsAnonymous()) {
+            optionsList.add(getString(R.string.use_anonymously_button));
         }
+
+        options.setAdapter(new ArrayAdapter<>(
+                this,
+                R.layout.single_list_item,
+                android.R.id.text1,
+                optionsList.toArray(new String[optionsList.size()])
+        ));
+        options.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                String text = ((TextView) view).getText().toString();
+                Intent intent;
+                if (text.equals(getString(R.string.login_to_profile))) {
+                    Log.d(TAG, "login selected");
+                    intent = new Intent(getApplicationContext(), LoginActivity.class);
+                } else if (text.equals(getString(R.string.create_profile))) {
+                    Log.d(TAG, "signup selected");
+                    intent = new Intent(getApplicationContext(), SignupActivity.class);
+                } else {
+                    Log.d(TAG, "use anonymously selected");
+                    intent = new Intent();
+                    intent.putExtra(Provider.KEY, provider);
+                    setResult(RESULT_OK, intent);
+                    finish();
+                    return;
+                }
+                intent.putExtra(PROVIDER_KEY, provider);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                startActivityForResult(intent, REQUEST_CODE_CONFIGURE_LEAP);
+            }
+        });
     }
 
     @Override
@@ -104,29 +101,4 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
         }
     }
 
-    private boolean anonAllowed(JSONObject providerJson) {
-        try {
-            JSONObject serviceDescription = providerJson.getJSONObject(Provider.SERVICE);
-            return serviceDescription.has(PROVIDER_ALLOW_ANONYMOUS) && serviceDescription.getBoolean(PROVIDER_ALLOW_ANONYMOUS);
-        } catch (JSONException e) {
-            return false;
-        }
-    }
-
-    private boolean registrationAllowed(JSONObject providerJson) {
-        try {
-            JSONObject serviceDescription = providerJson.getJSONObject(Provider.SERVICE);
-            return serviceDescription.has(Provider.ALLOW_REGISTRATION) && serviceDescription.getBoolean(Provider.ALLOW_REGISTRATION);
-        } catch (JSONException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.remove(Provider.KEY).remove(PROVIDER_ALLOW_ANONYMOUS).remove(PROVIDER_KEY).apply();
-        super.onBackPressed();
-    }
-
 }