create ProviderDetail Activity

3 files changed, 134 insertions, 121 deletions

diff --git a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
index 1823d3e3..fc7c9ede 100644
--- a/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ b/app/src/production/java/se/leap/bitmaskclient/NewProviderDialog.java
@@ -16,14 +16,20 @@
  */
 package se.leap.bitmaskclient;
 
-import butterknife.*;
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
 
-import android.app.*;
-import android.content.*;
-import android.os.*;
-import android.view.*;
-import android.widget.*;
+import butterknife.ButterKnife;
+import butterknife.InjectView;
 
 /**
  * Implements the new custom provider dialog.
@@ -38,23 +44,24 @@ public class NewProviderDialog extends DialogFragment {
     EditText url_input_field;
 
     public interface NewProviderDialogInterface {
-        public void showAndSelectProvider(String url_provider);
+        void showAndSelectProvider(String url_provider);
     }
 
     NewProviderDialogInterface interface_with_ConfigurationWizard;
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
         try {
-            interface_with_ConfigurationWizard = (NewProviderDialogInterface) activity;
+            interface_with_ConfigurationWizard = (NewProviderDialogInterface) context;
         } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString()
+            throw new ClassCastException(context.toString()
                     + " must implement NoticeDialogListener");
         }
     }
 
     @Override
+    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -96,7 +103,6 @@ public class NewProviderDialog extends DialogFragment {
         } else {
             url_input_field.setText("");
             Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();
-            ;
         }
     }
 
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderDetailActivity.java b/app/src/production/java/se/leap/bitmaskclient/ProviderDetailActivity.java
new file mode 100644
index 00000000..0c5b1957
--- /dev/null
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderDetailActivity.java
@@ -0,0 +1,115 @@
+package se.leap.bitmaskclient;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+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.ButterKnife;
+import butterknife.InjectView;
+
+public class ProviderDetailActivity extends Activity {
+
+    final public static String TAG = "providerDetailActivity";
+    private SharedPreferences preferences;
+
+    @InjectView(R.id.provider_detail_domain)
+    TextView domain;
+
+    @InjectView(R.id.provider_detail_name)
+    TextView name;
+
+    @InjectView(R.id.provider_detail_description)
+    TextView description;
+
+    @InjectView(R.id.provider_detail_options)
+    ListView options;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.provider_detail_fragment);
+        ButterKnife.inject(this);
+
+        preferences = getSharedPreferences(Constants.SHARED_PREFERENCES, MODE_PRIVATE);
+        try {
+            JSONObject provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
+            domain.setText(provider_json.getString(Provider.DOMAIN));
+            name.setText(provider_json.getJSONObject(Provider.NAME).getString("en"));
+            description.setText(provider_json.getJSONObject(Provider.DESCRIPTION).getString("en"));
+
+            setTitle(R.string.provider_details_title);
+
+            ArrayList<String> optionsList = new ArrayList<>();
+            optionsList.add(getString(R.string.login_button));
+            if (registration_allowed(provider_json)) {
+                optionsList.add(getString(R.string.signup_button));
+            }
+            if (anon_allowed(provider_json)) {
+                optionsList.add(getString(R.string.use_anonymously_button));
+            }
+
+            options.setAdapter(new ArrayAdapter<>(
+                    this,
+                    android.R.layout.simple_list_item_activated_1,
+                    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();
+                    if (text.equals(getString(R.string.login_button))) {
+                        Log.d(TAG, "login selected");
+                    } else if (text.equals(getString(R.string.signup_button))) {
+                        Log.d(TAG, "signup selected");
+                    } else if (text.equals(getString(R.string.use_anonymously_button))) {
+                        Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                        startActivity(intent);
+                    }
+                }
+            });
+        } catch (JSONException e) {
+            // TODO show error and return
+        }
+    }
+
+    private boolean anon_allowed(JSONObject provider_json) {
+        try {
+            JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
+            return service_description.has(Constants.PROVIDER_ALLOW_ANONYMOUS) && service_description.getBoolean(Constants.PROVIDER_ALLOW_ANONYMOUS);
+        } catch (JSONException e) {
+            return false;
+        }
+    }
+
+    private boolean registration_allowed(JSONObject provider_json) {
+        try {
+            JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
+            return service_description.has(Provider.ALLOW_REGISTRATION) && service_description.getBoolean(Provider.ALLOW_REGISTRATION);
+        } catch (JSONException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.remove(Provider.KEY).remove(Constants.PROVIDER_ALLOW_ANONYMOUS).remove(Constants.PROVIDER_KEY).apply();
+        super.onBackPressed();
+    }
+
+}
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/production/java/se/leap/bitmaskclient/ProviderDetailFragment.java
deleted file mode 100644
index c7224ede..00000000
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderDetailFragment.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package se.leap.bitmaskclient;
-
-import org.json.*;
-
-import android.app.*;
-import android.content.*;
-import android.os.*;
-import android.view.*;
-import android.widget.*;
-
-public class ProviderDetailFragment extends DialogFragment {
-
-    final public static String TAG = "providerDetailFragment";
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        try {
-
-            LayoutInflater inflater = getActivity().getLayoutInflater();
-            View provider_detail_view = inflater.inflate(R.layout.provider_detail_fragment, null);
-
-            JSONObject provider_json = new JSONObject(getActivity().getSharedPreferences(Constants.SHARED_PREFERENCES, getActivity().MODE_PRIVATE).getString(Provider.KEY, ""));
-
-            final TextView domain = (TextView) provider_detail_view.findViewById(R.id.provider_detail_domain);
-            domain.setText(provider_json.getString(Provider.DOMAIN));
-            final TextView name = (TextView) provider_detail_view.findViewById(R.id.provider_detail_name);
-            name.setText(provider_json.getJSONObject(Provider.NAME).getString("en"));
-            final TextView description = (TextView) provider_detail_view.findViewById(R.id.provider_detail_description);
-            description.setText(provider_json.getJSONObject(Provider.DESCRIPTION).getString("en"));
-
-            builder.setView(provider_detail_view);
-            builder.setTitle(R.string.provider_details_fragment_title);
-
-            if (anon_allowed(provider_json)) {
-                builder.setPositiveButton(R.string.use_anonymously_button, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        interface_with_configuration_wizard.use_anonymously();
-                    }
-                });
-            }
-
-            if (registration_allowed(provider_json)) {
-                builder.setNegativeButton(R.string.signup_or_login_button, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        interface_with_configuration_wizard.login();
-                    }
-                });
-            }
-
-            return builder.create();
-        } catch (JSONException e) {
-            return null;
-        }
-    }
-
-    private boolean anon_allowed(JSONObject provider_json) {
-        try {
-            JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
-            return service_description.has(Constants.PROVIDER_ALLOW_ANONYMOUS) && service_description.getBoolean(Constants.PROVIDER_ALLOW_ANONYMOUS);
-        } catch (JSONException e) {
-            return false;
-        }
-    }
-
-    private boolean registration_allowed(JSONObject provider_json) {
-        try {
-            JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE);
-            return service_description.has(Provider.ALLOW_REGISTRATION) && service_description.getBoolean(Provider.ALLOW_REGISTRATION);
-        } catch (JSONException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        super.onCancel(dialog);
-        SharedPreferences.Editor editor = getActivity().getSharedPreferences(Constants.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit();
-        editor.remove(Provider.KEY).remove(Constants.PROVIDER_ALLOW_ANONYMOUS).remove(Constants.PROVIDER_KEY).commit();
-        interface_with_configuration_wizard.cancelAndShowAllProviders();
-    }
-
-    public static DialogFragment newInstance() {
-        ProviderDetailFragment provider_detail_fragment = new ProviderDetailFragment();
-        return provider_detail_fragment;
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        try {
-            interface_with_configuration_wizard = (ProviderDetailFragmentInterface) activity;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(activity.toString()
-                    + " must implement LogInDialogListener");
-        }
-    }
-
-    public interface ProviderDetailFragmentInterface {
-        public void login();
-
-        public void use_anonymously();
-
-        public void cancelAndShowAllProviders();
-    }
-
-    ProviderDetailFragmentInterface interface_with_configuration_wizard;
-}