From 9bb172e96cfd741e528e692118ee32fc609c6da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 24 Mar 2015 18:59:27 +0100 Subject: Cleaned imports, use wildcards when appropriate --- .../leap/bitmaskclient/ProviderDetailFragment.java | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java') diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java index 97ce5245..0f978290 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -1,17 +1,16 @@ -package se.leap.bitmaskclient; - -import org.json.*; - -import se.leap.bitmaskclient.R; -import se.leap.bitmaskclient.eip.Constants; -import se.leap.bitmaskclient.ProviderListContent.ProviderItem; - -import android.app.*; -import android.content.*; -import android.os.Bundle; -import android.view.*; -import android.widget.TextView; - +package se.leap.bitmaskclient; + +import org.json.*; + +import se.leap.bitmaskclient.eip.*; +import se.leap.bitmaskclient.ProviderListContent.ProviderItem; + +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"; @@ -61,7 +60,7 @@ public class ProviderDetailFragment extends DialogFragment { private boolean anon_allowed(JSONObject provider_json) { try { JSONObject service_description = provider_json.getJSONObject(Provider.SERVICE); - return service_description.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); + return service_description.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); } catch (JSONException e) { return false; } @@ -80,8 +79,8 @@ public class ProviderDetailFragment extends DialogFragment { public void onCancel(DialogInterface dialog) { super.onCancel(dialog); SharedPreferences.Editor editor = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit(); - editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); - interface_with_configuration_wizard.showAllProviders(); + editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); + interface_with_configuration_wizard.showAllProviders(); } public static DialogFragment newInstance() { -- cgit v1.2.3 From b87f082fe0e9c05cf45c56b510a2c4000133b572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 24 Mar 2015 19:07:43 +0100 Subject: Indent everything with IntelliJ --- .../leap/bitmaskclient/ProviderDetailFragment.java | 203 +++++++++++---------- 1 file changed, 111 insertions(+), 92 deletions(-) (limited to 'app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java') diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java index 0f978290..c3ba0a42 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -14,96 +14,115 @@ 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(Dashboard.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.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); - } 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(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit(); - editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); - interface_with_configuration_wizard.showAllProviders(); - } - - 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"); + + rride + pub ic + + Dialog onCreateDialog(Bundle savedInstanceState) { + Al tDialog.Builder builder = new AlertDialog.Builder(getActivity()); + tr { + + L utInflater inflater = getActivity().getLayoutInflater(); + V provider_detail_view = inflater.inflate(R.layout.provider_detail_fragment, null); + + + ect provider_json = new JSONObject(getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, getActivity().MODE_PRIVATE).getString(Provider.KEY, "")); + + fin + View domain = (TextView) provider_d + etail_view.findViewById(R.id.provider_detail_domain); + domain.Text(provider_json.getString(Provider.DOMAIN)); + final T View name = (TextView) provider_d + etail_view.findViewById(R.id.provider_detail_name); + name.se xt (provider_json.getJSONObject(Provider.NAME).getString("en")); + final T View description = (TextView) provider_d + etail_view.findViewById(R.id.provider_detail_description); + descrip n.setText(provider_json.getJSONObject(Provider.DESCRIPTION).getString("en")); + + builde + ew(provider_detail_view); + builder.se tle (R.string.provider_details_fragment_title); + + if (anon_a + pr ovider_json)){ + builder.setP iveButton + (R.string.use_anonymously_button, new DialogInterface.OnClickListener() { + public void ick(DialogInterface dialog, int id) { + interface_ onfiguration_wizard.use_anonymously(); + } + }); + regi ati al lowed (provider_json)){ + builder.setN iveButton + (R.string.signup_or_login_button, new DialogInterface.OnClickListener() { + public void ick(DialogInterface dialog, int id) { + interface_ onfiguration_wizard.login(); + } + }); + urn lde reate(); + }catch(JSONE eption e){ + return null; + + } + + private oo ea + non_allowed(JSONObject provider_json) { + try { + JSONOb ct ser e_description = provider_json.getJSONObject(Provider.SERVICE); + return service + scription.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); + } catch (JSONEx ption e){ + return false; + + } + + private ol an + gistration_allowed(JSONObject provider_json) { + try { + JSONObj t serv _description = provider_json.getJSONObject(Provider.SERVICE); + return service_ + cription.has(Provider.ALLOW_REGISTRATION) && service_description.getBoolean(Provider.ALLOW_REGISTRATION); + } catch (JSONExc tion e){ + return false; + } + + @Override pu li + oid onCanc l(DialogInterface dialog) { + super.onCancel(di og); + SharedPreferences ditor + editor = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit(); + editor.remove(Pro der.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); + interface_with_co iguration_wizard.showAllProviders(); + } + + public static ial gFragment newInstance() { + ProviderDetailFra ent provider_detail_fragment = new ProviderDetailFragment(); + return provider_d ail_fragment; + } + + @Override + ublic void onAttach (Activity activity){ + super.onAttach(activity); + try { + interface_with_conf guration_wizard = (ProviderDetailFragmentInterface) activity; + } catch (ClassCastException e) { + throw new ClassCastException(activity.toString() + + " must implement LogInDialogListener"); + } + } + + public interface P + iderDetailFragmentInterface { + public void login() + + public void use_ano + + mously(); + + public void showAll + + oviders(); + } + + ProviderDetailFr gm + Interface interface_with_configuration_wizard; } - } - - public interface ProviderDetailFragmentInterface { - public void login(); - public void use_anonymously(); - public void showAllProviders(); - } - - ProviderDetailFragmentInterface interface_with_configuration_wizard; -} -- cgit v1.2.3 From 9e5d0f1a2399787b1a57349e0e3b5ad596fcbf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 24 Mar 2015 19:35:07 +0100 Subject: ProviderDetailFragment release was bad formated --- .../leap/bitmaskclient/ProviderDetailFragment.java | 185 ++++++++++----------- 1 file changed, 84 insertions(+), 101 deletions(-) (limited to 'app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java') diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java index c3ba0a42..24d048a6 100644 --- a/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java +++ b/app/src/release/java/se/leap/bitmaskclient/ProviderDetailFragment.java @@ -15,114 +15,97 @@ public class ProviderDetailFragment extends DialogFragment { final public static String TAG = "providerDetailFragment"; - rride - pub ic - - Dialog onCreateDialog(Bundle savedInstanceState) { - Al tDialog.Builder builder = new AlertDialog.Builder(getActivity()); - tr { - - L utInflater inflater = getActivity().getLayoutInflater(); - V provider_detail_view = inflater.inflate(R.layout.provider_detail_fragment, null); - - - ect provider_json = new JSONObject(getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, getActivity().MODE_PRIVATE).getString(Provider.KEY, "")); - - fin - View domain = (TextView) provider_d - etail_view.findViewById(R.id.provider_detail_domain); - domain.Text(provider_json.getString(Provider.DOMAIN)); - final T View name = (TextView) provider_d - etail_view.findViewById(R.id.provider_detail_name); - name.se xt (provider_json.getJSONObject(Provider.NAME).getString("en")); - final T View description = (TextView) provider_d - etail_view.findViewById(R.id.provider_detail_description); - descrip n.setText(provider_json.getJSONObject(Provider.DESCRIPTION).getString("en")); - - builde - ew(provider_detail_view); - builder.se tle (R.string.provider_details_fragment_title); - - if (anon_a - pr ovider_json)){ - builder.setP iveButton - (R.string.use_anonymously_button, new DialogInterface.OnClickListener() { - public void ick(DialogInterface dialog, int id) { - interface_ onfiguration_wizard.use_anonymously(); + @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(Dashboard.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(); } }); - regi ati al lowed (provider_json)){ - builder.setN iveButton - (R.string.signup_or_login_button, new DialogInterface.OnClickListener() { - public void ick(DialogInterface dialog, int id) { - interface_ onfiguration_wizard.login(); - } - }); - urn lde reate(); - }catch(JSONE eption e){ - return null; - - } - - private oo ea - non_allowed(JSONObject provider_json) { - try { - JSONOb ct ser e_description = provider_json.getJSONObject(Provider.SERVICE); - return service - scription.has(Constants.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); - } catch (JSONEx ption e){ - return false; - - } - - private ol an - gistration_allowed(JSONObject provider_json) { - try { - JSONObj t serv _description = provider_json.getJSONObject(Provider.SERVICE); - return service_ - cription.has(Provider.ALLOW_REGISTRATION) && service_description.getBoolean(Provider.ALLOW_REGISTRATION); - } catch (JSONExc tion e){ - return false; - } - - @Override pu li - oid onCanc l(DialogInterface dialog) { - super.onCancel(di og); - SharedPreferences ditor - editor = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit(); - editor.remove(Pro der.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); - interface_with_co iguration_wizard.showAllProviders(); - } - - public static ial gFragment newInstance() { - ProviderDetailFra ent provider_detail_fragment = new ProviderDetailFragment(); - return provider_d ail_fragment; } - @Override - ublic void onAttach (Activity activity){ - super.onAttach(activity); - try { - interface_with_conf guration_wizard = (ProviderDetailFragmentInterface) activity; - } catch (ClassCastException e) { - throw new ClassCastException(activity.toString() - + " must implement LogInDialogListener"); - } + 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(); + } + }); } - public interface P - iderDetailFragmentInterface { - public void login() - - public void use_ano + 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.ALLOWED_ANON) && service_description.getBoolean(Constants.ALLOWED_ANON); + } 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(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).edit(); + editor.remove(Provider.KEY).remove(Constants.ALLOWED_ANON).remove(Constants.KEY).commit(); + interface_with_configuration_wizard.showAllProviders(); + } + + 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"); + } + } - mously(); + public interface ProviderDetailFragmentInterface { + public void login(); - public void showAll + public void use_anonymously(); - oviders(); - } + public void showAllProviders(); + } - ProviderDetailFr gm - Interface interface_with_configuration_wizard; - } + ProviderDetailFragmentInterface interface_with_configuration_wizard; +} -- cgit v1.2.3