summaryrefslogtreecommitdiff
path: root/app/src/insecure/java/se/leap
diff options
context:
space:
mode:
authorlalottacontinua <loddatio@posteo.de>2018-07-21 03:01:44 -0700
committerlalottacontinua <loddatio@posteo.de>2018-07-21 03:01:44 -0700
commit7434a53d0c2545375ff9844a510c9fc8b09948f0 (patch)
treebdf7b4a2ee6043c3c63cce265fa7c52e5eb92273 /app/src/insecure/java/se/leap
parentce6f1c9c9b402bc2e92462353bb56cadfb9b2f35 (diff)
parent9b50dcae236f9f93d24f7991df4d7acf64219b73 (diff)
Merge branch '#8886_add_provider' into 'master'
#8886 add provider See merge request leap/bitmask_android!79
Diffstat (limited to 'app/src/insecure/java/se/leap')
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java89
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/NewProviderDialog.java126
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java3
-rw-r--r--app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java20
4 files changed, 92 insertions, 146 deletions
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java
new file mode 100644
index 00000000..10608a14
--- /dev/null
+++ b/app/src/insecure/java/se/leap/bitmaskclient/AddProviderActivity.java
@@ -0,0 +1,89 @@
+package se.leap.bitmaskclient;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import butterknife.InjectView;
+import butterknife.Optional;
+import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
+
+import static android.widget.RelativeLayout.BELOW;
+import static android.widget.RelativeLayout.LEFT_OF;
+
+public class AddProviderActivity extends AddProviderBaseActivity {
+
+ final public static String TAG = "AddProviderActivity";
+
+ @InjectView(R.id.danger_checkbox)
+ CheckBox checkboxDanger;
+
+ @InjectView(R.id.button_save)
+ Button saveButton;
+
+ @Optional
+ @InjectView(R.id.button_container)
+ LinearLayout buttonContainer;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.a_add_provider);
+ init();
+
+ checkboxDanger.setVisibility(View.VISIBLE);
+ checkboxDanger.setText(R.string.danger_checkbox);
+ checkboxDanger.setChecked(preferences.getBoolean(ProviderItem.DANGER_ON, false));
+ }
+
+ @Override
+ public void setupSaveButton() {
+ saveButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ preferences.edit().putBoolean(ProviderItem.DANGER_ON, checkboxDanger.isChecked()).apply();
+ saveProvider();
+ }
+ });
+ }
+
+ @Override
+ protected void showCompactLayout() {
+ if (isCompactLayout) {
+ return;
+ }
+ super.showCompactLayout();
+ showCompactButtonLayout();
+ }
+
+ @Override
+ protected void showStandardLayout() {
+ if (!isCompactLayout) {
+ return;
+ }
+ super.showStandardLayout();
+ showStandardButtonLayout();
+ }
+
+ private void showCompactButtonLayout() {
+ RelativeLayout.LayoutParams phoneButtonContainerParams = (RelativeLayout.LayoutParams) buttonContainer.getLayoutParams();
+ phoneButtonContainerParams.addRule(BELOW, 0);
+ buttonContainer.setLayoutParams(phoneButtonContainerParams);
+
+ RelativeLayout.LayoutParams checkBoxParams = (RelativeLayout.LayoutParams) checkboxDanger.getLayoutParams();
+ checkBoxParams.addRule(LEFT_OF, R.id.button_container);
+ checkboxDanger.setLayoutParams(checkBoxParams);
+ }
+
+ private void showStandardButtonLayout() {
+ RelativeLayout.LayoutParams phoneButtonContainerParams = (RelativeLayout.LayoutParams) buttonContainer.getLayoutParams();
+ phoneButtonContainerParams.addRule(BELOW, R.id.danger_checkbox);
+ buttonContainer.setLayoutParams(phoneButtonContainerParams);
+
+ RelativeLayout.LayoutParams checkBoxParams = (RelativeLayout.LayoutParams) checkboxDanger.getLayoutParams();
+ checkBoxParams.addRule(LEFT_OF, 0);
+ checkboxDanger.setLayoutParams(checkBoxParams);
+ }
+}
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/NewProviderDialog.java b/app/src/insecure/java/se/leap/bitmaskclient/NewProviderDialog.java
deleted file mode 100644
index d7d9eec5..00000000
--- a/app/src/insecure/java/se/leap/bitmaskclient/NewProviderDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright (c) 2013 LEAP Encryption Access Project and contributers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package se.leap.bitmaskclient;
-
-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.CheckBox;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import butterknife.ButterKnife;
-import butterknife.InjectView;
-import se.leap.bitmaskclient.ProviderListContent.ProviderItem;
-
-/**
- * Implements the new custom provider dialog.
- *
- * @author parmegv
- */
-public class NewProviderDialog extends DialogFragment {
-
- final public static String TAG = "newProviderDialog";
-
- @InjectView(R.id.new_provider_url)
- EditText url_input_field;
-
- @InjectView(R.id.danger_checkbox)
- CheckBox danger_checkbox;
-
- public interface NewProviderDialogInterface {
- void showAndSelectProvider(String url_provider, boolean danger_on);
- }
-
- NewProviderDialogInterface interface_with_ConfigurationWizard;
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- try {
- interface_with_ConfigurationWizard = (NewProviderDialogInterface) context;
- } catch (ClassCastException e) {
- 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();
- View view = inflater.inflate(R.layout.new_provider_dialog, null);
- ButterKnife.inject(this, view);
- Bundle arguments = getArguments();
- if (arguments != null) {
- url_input_field.setText(arguments.getString(Provider.MAIN_URL, ""));
- danger_checkbox.setActivated(arguments.getBoolean(ProviderItem.DANGER_ON, false));
- }
-
- builder.setView(view)
- .setMessage(R.string.introduce_new_provider)
- .setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- saveProvider();
- }
- })
- .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
- dialog.cancel();
- }
- });
- // Create the AlertDialog object and return it
- return builder.create();
- }
-
- private void saveProvider() {
- String entered_url = url_input_field.getText().toString().trim();
- if (!entered_url.startsWith("https://")) {
- if (entered_url.startsWith("http://")) {
- entered_url = entered_url.substring("http://".length());
- }
- entered_url = "https://".concat(entered_url);
- }
- boolean danger_on = danger_checkbox.isChecked();
- if (validURL(entered_url)) {
- interface_with_ConfigurationWizard.showAndSelectProvider(entered_url, danger_on);
- Toast.makeText(getActivity().getApplicationContext(), R.string.valid_url_entered, Toast.LENGTH_LONG).show();
- } else {
- url_input_field.setText("");
- danger_checkbox.setChecked(false);
- Toast.makeText(getActivity().getApplicationContext(), R.string.not_valid_url_entered, Toast.LENGTH_LONG).show();
- }
- }
-
- /**
- * Checks if the entered url is valid or not.
- *
- * @param entered_url
- * @return true if it's not empty nor contains only the protocol.
- */
- boolean validURL(String entered_url) {
- //return !entered_url.isEmpty() && entered_url.matches("http[s]?://.+") && !entered_url.replaceFirst("http[s]?://", "").isEmpty();
- return android.util.Patterns.WEB_URL.matcher(entered_url).matches();
- }
-}
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
index 7e33cd63..e3fb549f 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderApiManager.java
@@ -142,8 +142,7 @@ public class ProviderApiManager extends ProviderApiManagerBase {
providerDotJsonString = downloadFromApiUrlWithProviderCA("/provider.json", caCert, providerDefinition, dangerOn);
if (ConfigHelper.checkErroneousDownload(providerDotJsonString) || !isValidJson(providerDotJsonString)) {
- result.putString(ERRORS, resources.getString(malformed_url));
- result.putBoolean(BROADCAST_RESULT_KEY, false);
+ setErrorResult(result, malformed_url, null);
return result;
}
diff --git a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
index 67565d70..3190d651 100644
--- a/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
+++ b/app/src/insecure/java/se/leap/bitmaskclient/ProviderListActivity.java
@@ -50,29 +50,13 @@ public class ProviderListActivity extends ProviderListBaseActivity {
preferences.edit().remove(ProviderItem.DANGER_ON).apply();
}
- public void showAndSelectProvider(String provider_main_url, boolean danger_on) {
- try {
- provider = new Provider(new URL((provider_main_url)));
- autoSelectProvider(provider, danger_on);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- }
-
- private void autoSelectProvider(Provider provider, boolean danger_on) {
- preferences.edit().putBoolean(ProviderItem.DANGER_ON, danger_on).apply();
- this.provider = provider;
- onItemSelectedLogic();
- showProgressBar();
- }
-
/**
* Asks ProviderAPI to download a new provider.json file
*
* @param danger_on tells if HTTPS client should bypass certificate errors
*/
public void setUpProvider(boolean danger_on) {
- mConfigState.setAction(SETTING_UP_PROVIDER);
+ configState.setAction(SETTING_UP_PROVIDER);
Bundle parameters = new Bundle();
parameters.putBoolean(ProviderItem.DANGER_ON, danger_on);
@@ -85,7 +69,7 @@ public class ProviderListActivity extends ProviderListBaseActivity {
*/
@Override
public void retrySetUpProvider(@NonNull Provider provider) {
- mConfigState.setAction(SETTING_UP_PROVIDER);
+ configState.setAction(SETTING_UP_PROVIDER);
ProviderAPICommand.execute(this, SET_UP_PROVIDER, provider);
}