summaryrefslogtreecommitdiff
path: root/app/src/main/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/main/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/main/java/se/leap')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/AddProviderBaseActivity.java124
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java181
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Constants.java1
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java60
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java124
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java16
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/utils/ViewHelper.java18
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java109
8 files changed, 541 insertions, 92 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/AddProviderBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/AddProviderBaseActivity.java
new file mode 100644
index 00000000..ca848f2e
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/AddProviderBaseActivity.java
@@ -0,0 +1,124 @@
+package se.leap.bitmaskclient;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Button;
+
+import butterknife.InjectView;
+
+import static se.leap.bitmaskclient.ProviderListBaseActivity.EXTRAS_KEY_INVALID_URL;
+
+/**
+ * Created by cyberta on 30.06.18.
+ */
+
+public abstract class AddProviderBaseActivity extends ConfigWizardBaseActivity {
+
+ final public static String EXTRAS_KEY_NEW_URL = "NEW_URL";
+
+ @InjectView(R.id.text_uri_error)
+ TextInputLayout urlError;
+
+ @InjectView(R.id.text_uri)
+ TextInputEditText editUrl;
+
+ @InjectView(R.id.button_cancel)
+ Button cancelButton;
+
+ @InjectView(R.id.button_save)
+ Button saveButton;
+
+
+ protected void init() {
+ Bundle extras = this.getIntent().getExtras();
+ if (extras != null && extras.containsKey(EXTRAS_KEY_INVALID_URL)) {
+ editUrl.setText(extras.getString(EXTRAS_KEY_INVALID_URL));
+ saveButton.setEnabled(true);
+ }
+
+ setupSaveButton();
+ setupCancelButton();
+ setUpListeners();
+ setUpInitialUI();
+ }
+
+ public abstract void setupSaveButton();
+
+ private void setupCancelButton() {
+ cancelButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ }
+
+ private void setUpInitialUI() {
+ setProviderHeaderText(R.string.add_provider);
+ hideProgressBar();
+ }
+
+ protected void saveProvider() {
+ String entered_url = getURL();
+ if (validURL(entered_url)) {
+ Intent intent = this.getIntent();
+ intent.putExtra(EXTRAS_KEY_NEW_URL, entered_url);
+ setResult(RESULT_OK, intent);
+ finish();
+ } else {
+ editUrl.setText("");
+ urlError.setError(getString(R.string.not_valid_url_entered));
+ }
+ }
+
+ private void setUpListeners() {
+
+ editUrl.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ if (!validURL(getURL())) {
+ urlError.setError(getString(R.string.not_valid_url_entered));
+ saveButton.setEnabled(false);
+
+ } else {
+ urlError.setError(null);
+ saveButton.setEnabled(true);
+ }
+ }
+ });
+ }
+
+ private String getURL() {
+ String entered_url = editUrl.getText().toString().trim();
+ if (entered_url.contains("www.")) entered_url = entered_url.replaceFirst("www.", "");
+ if (!entered_url.startsWith("https://")) {
+ if (entered_url.startsWith("http://")) {
+ entered_url = entered_url.substring("http://".length());
+ }
+ entered_url = "https://".concat(entered_url);
+ }
+ return entered_url;
+ }
+
+ /**
+ * Checks if the entered url is valid or not.
+ *
+ * @param enteredUrl
+ * @return true if it's not empty nor contains only the protocol.
+ */
+ boolean validURL(String enteredUrl) {
+ return android.util.Patterns.WEB_URL.matcher(enteredUrl).matches();
+ }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
index f0e2de85..227c8cf4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java
@@ -2,21 +2,28 @@ package se.leap.bitmaskclient;
import android.content.SharedPreferences;
import android.graphics.PorterDuff;
+import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.DrawableRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
+import android.support.constraint.ConstraintLayout;
+import android.support.constraint.Guideline;
import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatImageView;
import android.support.v7.widget.AppCompatTextView;
+import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import butterknife.InjectView;
+import butterknife.Optional;
+import se.leap.bitmaskclient.views.ProviderHeaderView;
+import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
@@ -30,28 +37,44 @@ import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
+ private static final String TAG = ConfigWizardBaseActivity.class.getName();
+ public static final float GUIDE_LINE_COMPACT_DELTA = 0.1f;
protected SharedPreferences preferences;
- @InjectView(R.id.provider_header_logo)
- AppCompatImageView providerHeaderLogo;
-
- @InjectView(R.id.provider_header_text)
- AppCompatTextView providerHeaderText;
+ @InjectView(R.id.header)
+ ProviderHeaderView providerHeaderView;
+ //Add provider screen has no loading screen
+ @Optional
@InjectView(R.id.loading_screen)
protected LinearLayout loadingScreen;
+ @Optional
@InjectView(R.id.progressbar)
protected ProgressBar progressBar;
+ @Optional
@InjectView(R.id.progressbar_description)
protected AppCompatTextView progressbarText;
+ //Only tablet layouts have guidelines as they are based on a ConstraintLayout
+ @Optional
+ @InjectView(R.id.guideline_top)
+ protected Guideline guideline_top;
+
+ @Optional
+ @InjectView(R.id.guideline_bottom)
+ protected Guideline guideline_bottom;
+
@InjectView(R.id.content)
protected LinearLayout content;
protected Provider provider;
+ protected boolean isCompactLayout = false;
+ private float defaultGuidelineTopPercentage;
+ private float defaultGuidelineBottomPercentage;
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -63,33 +86,44 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
@Override
public void setContentView(View view) {
super.setContentView(view);
- if (provider != null)
- setProviderHeaderText(provider.getName());
- setProgressbarColorForPreLollipop();
+ initContentView();
}
@Override
public void setContentView(int layoutResID) {
super.setContentView(layoutResID);
- if (provider != null)
- setProviderHeaderText(provider.getName());
- setProgressbarColorForPreLollipop();
+ initContentView();
}
@Override
public void setContentView(View view, ViewGroup.LayoutParams params) {
super.setContentView(view, params);
- if (provider != null)
+ initContentView();
+ }
+
+ private void initContentView() {
+ if (provider != null) {
setProviderHeaderText(provider.getName());
+ }
setProgressbarColorForPreLollipop();
+ setDefaultGuidelineValues();
+ setGlobalLayoutChangeListener();
+ }
+
+ private void setDefaultGuidelineValues() {
+ if (isTabletLayout()) {
+ defaultGuidelineTopPercentage = ((ConstraintLayout.LayoutParams) guideline_top.getLayoutParams()).guidePercent;
+ defaultGuidelineBottomPercentage = ((ConstraintLayout.LayoutParams) guideline_bottom.getLayoutParams()).guidePercent;
+ }
}
private void setProgressbarColorForPreLollipop() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- progressBar.getIndeterminateDrawable().setColorFilter(
- ContextCompat.getColor(this, R.color.colorPrimary),
- PorterDuff.Mode.SRC_IN);
+ if (progressBar == null || Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ return;
}
+ progressBar.getIndeterminateDrawable().setColorFilter(
+ ContextCompat.getColor(this, R.color.colorPrimary),
+ PorterDuff.Mode.SRC_IN);
}
@@ -108,33 +142,134 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
}
protected void setProviderHeaderLogo(@DrawableRes int providerHeaderLogo) {
- this.providerHeaderLogo.setImageResource(providerHeaderLogo);
+ providerHeaderView.setLogo(providerHeaderLogo);
}
protected void setProviderHeaderText(String providerHeaderText) {
- this.providerHeaderText.setText(providerHeaderText);
+ providerHeaderView.setTitle(providerHeaderText);
}
protected void setProviderHeaderText(@StringRes int providerHeaderText) {
- this.providerHeaderText.setText(providerHeaderText);
+ providerHeaderView.setTitle(providerHeaderText);
}
protected void hideProgressBar() {
+ if (loadingScreen == null) {
+ return;
+ }
loadingScreen.setVisibility(GONE);
content.setVisibility(VISIBLE);
}
protected void showProgressBar() {
+ if (loadingScreen == null) {
+ return;
+ }
content.setVisibility(GONE);
loadingScreen.setVisibility(VISIBLE);
}
- protected void setProgressbarText(String progressbarText) {
+ protected void setProgressbarText(@StringRes int progressbarText) {
+ if (this.progressbarText == null) {
+ return;
+ }
this.progressbarText.setText(progressbarText);
}
- protected void setProgressbarText(@StringRes int progressbarText) {
- this.progressbarText.setText(progressbarText);
+
+ protected void showCompactLayout() {
+ if (isCompactLayout) {
+ return;
+ }
+
+ if (isTabletLayoutInLandscape() || isPhoneLayout()) {
+ providerHeaderView.showCompactLayout();
+ }
+
+ showIncreasedTabletContentArea();
+ isCompactLayout = true;
+ }
+
+ protected void showStandardLayout() {
+ if (!isCompactLayout) {
+ return;
+ }
+ providerHeaderView.showStandardLayout();
+ showStandardTabletContentArea();
+ isCompactLayout = false;
+ }
+
+ private boolean isTabletLayoutInLandscape() {
+ // TabletLayout is based on a ConstraintLayout and uses Guidelines whereas the phone layout
+ // has no such elements in it's layout xml file
+ return guideline_top != null &&
+ guideline_bottom != null &&
+ getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE;
+ }
+
+ protected boolean isPhoneLayout() {
+ return guideline_top == null && guideline_bottom == null;
+ }
+
+ protected boolean isTabletLayout() {
+ return guideline_top != null && guideline_bottom != null;
+ }
+
+ /**
+ * Increases the white content area in tablet layouts
+ */
+ private void showIncreasedTabletContentArea() {
+ if (isPhoneLayout()) {
+ return;
+ }
+ ConstraintLayout.LayoutParams guideLineTopParams = (ConstraintLayout.LayoutParams) guideline_top.getLayoutParams();
+ float increasedTopPercentage = defaultGuidelineTopPercentage - GUIDE_LINE_COMPACT_DELTA;
+ guideLineTopParams.guidePercent = increasedTopPercentage > 0f ? increasedTopPercentage : 0f;
+ guideline_top.setLayoutParams(guideLineTopParams);
+
+ ConstraintLayout.LayoutParams guideLineBottomParams = (ConstraintLayout.LayoutParams) guideline_bottom.getLayoutParams();
+ float increasedBottomPercentage = defaultGuidelineBottomPercentage + GUIDE_LINE_COMPACT_DELTA;
+ guideLineBottomParams.guidePercent = increasedBottomPercentage < 1f ? increasedBottomPercentage : 1f;
+ guideline_bottom.setLayoutParams(guideLineBottomParams);
+ }
+
+ /**
+ * Restores the default size of the white content area in tablet layouts
+ */
+ private void showStandardTabletContentArea() {
+ if (isPhoneLayout()) {
+ return;
+ }
+ ConstraintLayout.LayoutParams guideLineTopParams = (ConstraintLayout.LayoutParams) guideline_top.getLayoutParams();
+ guideLineTopParams.guidePercent = defaultGuidelineTopPercentage;
+ guideline_top.setLayoutParams(guideLineTopParams);
+
+ ConstraintLayout.LayoutParams guideLineBottomParams = (ConstraintLayout.LayoutParams) guideline_bottom.getLayoutParams();
+ guideLineBottomParams.guidePercent = defaultGuidelineBottomPercentage;
+ guideline_bottom.setLayoutParams(guideLineBottomParams);
+ }
+
+ /**
+ * Checks if the keyboard is shown and switches between the standard layout and the compact layout
+ */
+ private void setGlobalLayoutChangeListener() {
+ final View rootView = content.getRootView();
+ rootView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ Rect r = new Rect();
+ //r will be populated with the coordinates of your view that area still visible.
+ rootView.getWindowVisibleDisplayFrame(r);
+
+ float deltaHiddenScreen = 1f - ((float) (r.bottom - r.top) / (float) rootView.getHeight());
+ if (deltaHiddenScreen > 0.25f) {
+ // if more than 1/4 of the screen is hidden
+ showCompactLayout();
+ } else {
+ showStandardLayout();
+ }
+ }
+ });
}
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/Constants.java b/app/src/main/java/se/leap/bitmaskclient/Constants.java
index 8ec3fcc7..2efc2c1f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Constants.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Constants.java
@@ -21,6 +21,7 @@ public interface Constants {
int REQUEST_CODE_CONFIGURE_LEAP = 0;
int REQUEST_CODE_SWITCH_PROVIDER = 1;
int REQUEST_CODE_LOG_IN = 2;
+ int REQUEST_CODE_ADD_PROVIDER = 3;
//////////////////////////////////////////////
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
index 15cd9617..27fe9e40 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
@@ -16,6 +16,7 @@ import android.support.v7.widget.AppCompatButton;
import android.support.v7.widget.AppCompatTextView;
import android.text.Editable;
import android.text.Html;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
@@ -33,6 +34,7 @@ import se.leap.bitmaskclient.Constants.CREDENTIAL_ERRORS;
import se.leap.bitmaskclient.eip.EipCommand;
import se.leap.bitmaskclient.userstatus.User;
+import static android.text.TextUtils.isEmpty;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
@@ -94,6 +96,10 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
@InjectView(R.id.button)
AppCompatButton button;
+ private boolean isUsernameError = false;
+ private boolean isPasswordError = false;
+ private boolean isVerificationError = false;
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -137,14 +143,42 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
userMessage.setText(savedInstance.getString(USER_MESSAGE));
userMessage.setVisibility(VISIBLE);
}
- usernameError.setError(savedInstance.getString(USERNAME_ERROR));
- passwordError.setError(savedInstance.getString(PASSWORD_ERROR));
- passwordVerificationError.setError(savedInstance.getString(PASSWORD_VERIFICATION_ERROR));
+ updateUsernameError(savedInstance.getString(USERNAME_ERROR));
+ updatePasswordError(savedInstance.getString(PASSWORD_ERROR));
+ updateVerificationError(savedInstance.getString(PASSWORD_VERIFICATION_ERROR));
if (savedInstance.getString(ACTIVITY_STATE) != null) {
mConfigState.setAction(savedInstance.getString(ACTIVITY_STATE));
}
}
+ private void updateUsernameError(String usernameErrorString) {
+ usernameError.setError(usernameErrorString);
+ isUsernameError = usernameErrorString != null;
+ updateButton();
+ }
+
+ private void updatePasswordError(String passwordErrorString) {
+ passwordError.setError(passwordErrorString);
+ isPasswordError = passwordErrorString != null;
+ updateButton();
+ }
+
+ private void updateVerificationError(String verificationErrorString) {
+ passwordVerificationError.setError(verificationErrorString);
+ isVerificationError = verificationErrorString != null;
+ updateButton();
+ }
+
+ private void updateButton() {
+ button.setEnabled(!isPasswordError &&
+ !isUsernameError &&
+ !isVerificationError &&
+ !isEmpty(passwordField.getText()) &&
+ !isEmpty(usernameField.getText()) &&
+ !(passwordVerificationField.getVisibility() == VISIBLE &&
+ getPasswordVerification().length() == 0));
+ }
+
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putString(ACTIVITY_STATE, mConfigState.getAction());
@@ -245,9 +279,9 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
public void afterTextChanged(Editable s) {
if (getUsername().equalsIgnoreCase("")) {
s.clear();
- usernameError.setError(getString(R.string.username_ask));
+ updateUsernameError(getString(R.string.username_ask));
} else {
- usernameError.setError(null);
+ updateUsernameError(null);
String suffix = "@" + provider.getDomain();
if (!usernameField.getText().toString().endsWith(suffix)) {
s.append(suffix);
@@ -281,9 +315,9 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
@Override
public void afterTextChanged(Editable s) {
if(getPassword().length() < 8) {
- passwordError.setError(getString(R.string.error_not_valid_password_user_message));
+ updatePasswordError(getString(R.string.error_not_valid_password_user_message));
} else {
- passwordError.setError(null);
+ updatePasswordError(null);
}
}
});
@@ -316,9 +350,9 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
@Override
public void afterTextChanged(Editable s) {
if(getPassword().equals(getPasswordVerification())) {
- passwordVerificationError.setError(null);
+ updateVerificationError(null);
} else {
- passwordVerificationError.setError(getString(R.string.password_mismatch));
+ updateVerificationError(getString(R.string.password_mismatch));
}
}
});
@@ -344,9 +378,9 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
}
private void handleReceivedErrors(Bundle arguments) {
- if (arguments.containsKey(CREDENTIAL_ERRORS.PASSWORD_INVALID_LENGTH.toString()))
- passwordError.setError(getString(R.string.error_not_valid_password_user_message));
- else if (arguments.containsKey(CREDENTIAL_ERRORS.RISEUP_WARNING.toString())) {
+ if (arguments.containsKey(CREDENTIAL_ERRORS.PASSWORD_INVALID_LENGTH.toString())) {
+ updatePasswordError(getString(R.string.error_not_valid_password_user_message));
+ } else if (arguments.containsKey(CREDENTIAL_ERRORS.RISEUP_WARNING.toString())) {
userMessage.setVisibility(VISIBLE);
userMessage.setText(R.string.login_riseup_warning);
}
@@ -355,7 +389,7 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
usernameField.setText(username);
}
if (arguments.containsKey(CREDENTIAL_ERRORS.USERNAME_MISSING.toString())) {
- usernameError.setError(getString(R.string.username_ask));
+ updateUsernameError(getString(R.string.username_ask));
}
if (arguments.containsKey(USER_MESSAGE)) {
String userMessageString = arguments.getString(USER_MESSAGE);
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
index 6a0a1864..cc8aceec 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java
@@ -1,16 +1,16 @@
/**
* Copyright (c) 2017 LEAP Encryption Access Project and contributors
- *
+ * <p>
* 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.
- *
+ * <p>
* 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.
- *
+ * <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -33,10 +33,11 @@ import android.widget.ListView;
import com.pedrogomez.renderers.Renderer;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -50,6 +51,7 @@ import static se.leap.bitmaskclient.Constants.BROADCAST_PROVIDER_API_EVENT;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;
import static se.leap.bitmaskclient.Constants.PROVIDER_KEY;
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_ADD_PROVIDER;
import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
import static se.leap.bitmaskclient.ProviderAPI.CORRECTLY_DOWNLOADED_VPN_CERTIFICATE;
import static se.leap.bitmaskclient.ProviderAPI.DOWNLOAD_VPN_CERTIFICATE;
@@ -72,7 +74,7 @@ import static se.leap.bitmaskclient.ProviderAPI.UPDATE_PROVIDER_DETAILS;
*/
public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
- implements NewProviderDialog.NewProviderDialogInterface, ProviderSetupFailedDialog.DownloadFailedDialogInterface, ProviderAPIResultReceiver.Receiver {
+ implements ProviderSetupFailedDialog.DownloadFailedDialogInterface, ProviderAPIResultReceiver.Receiver {
@InjectView(R.id.provider_list)
protected ListView providerListView;
@@ -80,7 +82,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
protected ProviderListAdapter adapter;
private ProviderManager providerManager;
- protected Intent mConfigState = new Intent(PROVIDER_NOT_SET);
+ protected Intent configState = new Intent(PROVIDER_NOT_SET);
final public static String TAG = ProviderListActivity.class.getSimpleName();
@@ -88,25 +90,26 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
final protected static String PROVIDER_NOT_SET = "PROVIDER NOT SET";
final protected static String SETTING_UP_PROVIDER = "PROVIDER GETS SET";
- final private static String SHOWING_PROVIDER_DETAILS = "SHOWING PROVIDER DETAILS";
+ final private static String SHOWING_PROVIDER_DETAILS = "SHOWING PROVIDER DETAILS";
final private static String PENDING_SHOW_FAILED_DIALOG = "SHOW FAILED DIALOG PENDING";
final private static String SHOW_FAILED_DIALOG = "SHOW FAILED DIALOG";
final private static String REASON_TO_FAIL = "REASON TO FAIL";
final protected static String SERVICES_RETRIEVED = "SERVICES RETRIEVED";
+ final protected static String EXTRAS_KEY_INVALID_URL = "INVALID_URL";
public ProviderAPIResultReceiver providerAPIResultReceiver;
private ProviderAPIBroadcastReceiver providerAPIBroadcastReceiver;
- FragmentManagerEnhanced fragmentManager;
+ private FragmentManagerEnhanced fragmentManager;
private boolean isActivityShowing;
private String reasonToFail;
+ private boolean testNewURL;
public abstract void retrySetUpProvider(@NonNull Provider provider);
protected abstract void onItemSelectedLogic();
-
private void initProviderList() {
List<Renderer<Provider>> prototypes = new ArrayList<>();
prototypes.add(new ProviderRenderer(this));
@@ -117,7 +120,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
@Override
public void onSaveInstanceState(@NotNull Bundle outState) {
- outState.putString(ACTIVITY_STATE, mConfigState.getAction());
+ outState.putString(ACTIVITY_STATE, configState.getAction());
outState.putString(REASON_TO_FAIL, reasonToFail);
super.onSaveInstanceState(outState);
@@ -128,7 +131,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
if (savedInstanceState == null) {
return;
}
- mConfigState.setAction(savedInstanceState.getString(ACTIVITY_STATE, PROVIDER_NOT_SET));
+ configState.setAction(savedInstanceState.getString(ACTIVITY_STATE, PROVIDER_NOT_SET));
if (savedInstanceState.containsKey(REASON_TO_FAIL)) {
reasonToFail = savedInstanceState.getString(REASON_TO_FAIL);
}
@@ -147,19 +150,19 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
@Override
protected void onResume() {
- Log.d(TAG, "resuming with ConfigState: " + mConfigState.getAction());
+ Log.d(TAG, "resuming with ConfigState: " + configState.getAction());
super.onResume();
setUpProviderAPIResultReceiver();
isActivityShowing = true;
- if (SETTING_UP_PROVIDER.equals(mConfigState.getAction())) {
+ if (SETTING_UP_PROVIDER.equals(configState.getAction())) {
showProgressBar();
checkProviderSetUp();
- } else if (PENDING_SHOW_FAILED_DIALOG.equals(mConfigState.getAction())) {
+ } else if (PENDING_SHOW_FAILED_DIALOG.equals(configState.getAction())) {
showProgressBar();
showDownloadFailedDialog();
- } else if (SHOW_FAILED_DIALOG.equals(mConfigState.getAction())) {
+ } else if (SHOW_FAILED_DIALOG.equals(configState.getAction())) {
showProgressBar();
- } else if (SHOWING_PROVIDER_DETAILS.equals(mConfigState.getAction())) {
+ } else if (SHOWING_PROVIDER_DETAILS.equals(configState.getAction())) {
cancelSettingUpProvider();
}
}
@@ -191,9 +194,33 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
setResult(resultCode, data);
finish();
}
+ } else if (requestCode == REQUEST_CODE_ADD_PROVIDER) {
+ if (resultCode == RESULT_OK) {
+ testNewURL = true;
+ String newUrl = data.getStringExtra(AddProviderActivity.EXTRAS_KEY_NEW_URL);
+ this.provider.setMainUrl(newUrl);
+ showAndSelectProvider(newUrl);
+ } else {
+ cancelSettingUpProvider();
+ }
}
}
+ public void showAndSelectProvider(String newURL) {
+ try {
+ provider = new Provider(new URL((newURL)));
+ autoSelectProvider();
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void autoSelectProvider() {
+ onItemSelectedLogic();
+ showProgressBar();
+ }
+
+
private void setUpProviderAPIResultReceiver() {
providerAPIResultReceiver = new ProviderAPIResultReceiver(new Handler(), this);
providerAPIBroadcastReceiver = new ProviderAPIBroadcastReceiver();
@@ -208,7 +235,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
adapter.add(provider);
adapter.saveProviders();
if (provider.allowsAnonymous()) {
- mConfigState.putExtra(SERVICES_RETRIEVED, true);
+ configState.putExtra(SERVICES_RETRIEVED, true);
downloadVpnCertificate();
} else {
showProviderDetails();
@@ -227,7 +254,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
void handleIncorrectlyDownloadedCertificate() {
cancelSettingUpProvider();
- setResult(RESULT_CANCELED, mConfigState);
+ setResult(RESULT_CANCELED, configState);
}
@Override
@@ -243,8 +270,8 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
@OnItemClick(R.id.provider_list)
void onItemSelected(int position) {
- if (SETTING_UP_PROVIDER.equals(mConfigState.getAction()) ||
- SHOW_FAILED_DIALOG.equals(mConfigState.getAction())) {
+ if (SETTING_UP_PROVIDER.equals(configState.getAction()) ||
+ SHOW_FAILED_DIALOG.equals(configState.getAction())) {
return;
}
@@ -252,7 +279,7 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
provider = adapter.getItem(position);
if (provider != null && !provider.isDefault()) {
//TODO Code 2 pane view
- mConfigState.setAction(SETTING_UP_PROVIDER);
+ configState.setAction(SETTING_UP_PROVIDER);
showProgressBar();
onItemSelectedLogic();
} else {
@@ -262,28 +289,24 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
@Override
public void onBackPressed() {
- if (SETTING_UP_PROVIDER.equals(mConfigState.getAction()) ||
- SHOW_FAILED_DIALOG.equals(mConfigState.getAction())) {
- stopSettingUpProvider();
+ if (SETTING_UP_PROVIDER.equals(configState.getAction()) ||
+ SHOW_FAILED_DIALOG.equals(configState.getAction())) {
+ cancelSettingUpProvider();
} else {
super.onBackPressed();
}
}
- private void stopSettingUpProvider() {
- cancelSettingUpProvider();
- }
-
@Override
public void cancelSettingUpProvider() {
- mConfigState.setAction(PROVIDER_NOT_SET);
+ configState.setAction(PROVIDER_NOT_SET);
provider = null;
hideProgressBar();
}
@Override
public void updateProviderDetails() {
- mConfigState.setAction(SETTING_UP_PROVIDER);
+ configState.setAction(SETTING_UP_PROVIDER);
ProviderAPICommand.execute(this, UPDATE_PROVIDER_DETAILS, provider);
}
@@ -298,28 +321,24 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
ProviderAPICommand.execute(this, DOWNLOAD_VPN_CERTIFICATE, provider);
}
+
/**
* Open the new provider dialog
*/
public void addAndSelectNewProvider() {
- addAndSelectNewProvider(null);
+ Intent intent = new Intent(this, AddProviderActivity.class);
+ startActivityForResult(intent, REQUEST_CODE_ADD_PROVIDER);
}
/**
* Open the new provider dialog
- * @param mainUrl - the main url of the provider to add - if null add a new provider
*/
- public void addAndSelectNewProvider(@Nullable String mainUrl) {
- FragmentTransaction fragmentTransaction = fragmentManager.removePreviousFragment(NewProviderDialog.TAG);
-
- DialogFragment newFragment = new NewProviderDialog();
-
- if (mainUrl != null) {
- Bundle data = new Bundle();
- data.putString(Provider.MAIN_URL, mainUrl);
- newFragment.setArguments(data);
- }
- newFragment.show(fragmentTransaction, NewProviderDialog.TAG);
+ @Override
+ public void addAndSelectNewProvider(String url) {
+ testNewURL = false;
+ Intent intent = new Intent(this, AddProviderActivity.class);
+ intent.putExtra(EXTRAS_KEY_INVALID_URL, url);
+ startActivityForResult(intent, REQUEST_CODE_ADD_PROVIDER);
}
/**
@@ -327,12 +346,12 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
*/
public void showDownloadFailedDialog() {
try {
- mConfigState.setAction(SHOW_FAILED_DIALOG);
+ configState.setAction(SHOW_FAILED_DIALOG);
FragmentTransaction fragmentTransaction = fragmentManager.removePreviousFragment(ProviderSetupFailedDialog.TAG);
DialogFragment newFragment;
try {
JSONObject errorJson = new JSONObject(reasonToFail);
- newFragment = ProviderSetupFailedDialog.newInstance(provider, errorJson);
+ newFragment = ProviderSetupFailedDialog.newInstance(provider, errorJson, testNewURL);
} catch (JSONException e) {
e.printStackTrace();
newFragment = ProviderSetupFailedDialog.newInstance(provider, reasonToFail);
@@ -343,23 +362,20 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
newFragment.show(fragmentTransaction, ProviderSetupFailedDialog.TAG);
} catch (IllegalStateException e) {
e.printStackTrace();
- mConfigState.setAction(PENDING_SHOW_FAILED_DIALOG);
+ configState.setAction(PENDING_SHOW_FAILED_DIALOG);
}
-
}
/**
* Once selected a provider, this fragment offers the user to log in,
* use it anonymously (if possible)
* or cancel his/her election pressing the back button.
- *
- *
*/
public void showProviderDetails() {
// show only if current activity is shown
- if (isActivityShowing && mConfigState.getAction() != null &&
- !mConfigState.getAction().equalsIgnoreCase(SHOWING_PROVIDER_DETAILS)) {
- mConfigState.setAction(SHOWING_PROVIDER_DETAILS);
+ if (isActivityShowing && configState.getAction() != null &&
+ !configState.getAction().equalsIgnoreCase(SHOWING_PROVIDER_DETAILS)) {
+ configState.setAction(SHOWING_PROVIDER_DETAILS);
Intent intent = new Intent(this, ProviderDetailActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
intent.putExtra(PROVIDER_KEY, provider);
@@ -377,8 +393,8 @@ public abstract class ProviderListBaseActivity extends ConfigWizardBaseActivity
return;
}
- if (mConfigState.getAction() != null &&
- mConfigState.getAction().equalsIgnoreCase(SETTING_UP_PROVIDER)) {
+ if (configState.getAction() != null &&
+ configState.getAction().equalsIgnoreCase(SETTING_UP_PROVIDER)) {
int resultCode = intent.getIntExtra(BROADCAST_RESULT_CODE, RESULT_CANCELED);
Log.d(TAG, "Broadcast resultCode: " + Integer.toString(resultCode));
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java
index 5bd9575e..3cfae776 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderSetupFailedDialog.java
@@ -52,7 +52,8 @@ public class ProviderSetupFailedDialog extends DialogFragment {
DEFAULT,
ERROR_CORRUPTED_PROVIDER_JSON,
ERROR_INVALID_CERTIFICATE,
- ERROR_CERTIFICATE_PINNING
+ ERROR_CERTIFICATE_PINNING,
+ ERROR_NEW_URL_NO_VPN_PROVIDER
}
/**
@@ -68,7 +69,7 @@ public class ProviderSetupFailedDialog extends DialogFragment {
/**
* @return a new instance of this DialogFragment.
*/
- public static DialogFragment newInstance(Provider provider, JSONObject errorJson) {
+ public static DialogFragment newInstance(Provider provider, JSONObject errorJson, boolean testNewURL) {
ProviderSetupFailedDialog dialogFragment = new ProviderSetupFailedDialog();
dialogFragment.provider = provider;
try {
@@ -81,6 +82,8 @@ public class ProviderSetupFailedDialog extends DialogFragment {
if (errorJson.has(ERRORID)) {
dialogFragment.downloadError = valueOf(errorJson.getString(ERRORID));
+ } else if (testNewURL) {
+ dialogFragment.downloadError = DOWNLOAD_ERRORS.ERROR_NEW_URL_NO_VPN_PROVIDER;
}
} catch (Exception e) {
e.printStackTrace();
@@ -123,6 +126,13 @@ public class ProviderSetupFailedDialog extends DialogFragment {
}
});
break;
+ case ERROR_NEW_URL_NO_VPN_PROVIDER:
+ builder.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+ interfaceWithConfigurationWizard.addAndSelectNewProvider(provider.getMainUrlString());
+ }
+ });
+ break;
default:
builder.setPositiveButton(R.string.retry, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
@@ -142,6 +152,8 @@ public class ProviderSetupFailedDialog extends DialogFragment {
void cancelSettingUpProvider();
void updateProviderDetails();
+
+ void addAndSelectNewProvider(String url);
}
DownloadFailedDialogInterface interfaceWithConfigurationWizard;
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/ViewHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/ViewHelper.java
new file mode 100644
index 00000000..86af3479
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/ViewHelper.java
@@ -0,0 +1,18 @@
+package se.leap.bitmaskclient.utils;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.annotation.DimenRes;
+import android.util.DisplayMetrics;
+
+/**
+ * Created by cyberta on 29.06.18.
+ */
+
+public class ViewHelper {
+
+ public static int convertDimensionToPx(Context context, @DimenRes int dimension) {
+ return context.getResources().getDimensionPixelSize(dimension);
+ }
+
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java b/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
new file mode 100644
index 00000000..ab5d6bc8
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
@@ -0,0 +1,109 @@
+package se.leap.bitmaskclient.views;
+
+import android.content.Context;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.RequiresApi;
+import android.support.annotation.StringRes;
+import android.support.v7.widget.AppCompatImageView;
+import android.support.v7.widget.AppCompatTextView;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import se.leap.bitmaskclient.R;
+
+import static se.leap.bitmaskclient.utils.ViewHelper.convertDimensionToPx;
+
+/**
+ * Created by cyberta on 29.06.18.
+ */
+
+public class ProviderHeaderView extends RelativeLayout {
+ private int stdPadding;
+ private int compactPadding;
+ private int stdImageSize;
+ private int compactImageSize;
+
+ AppCompatImageView providerHeaderLogo;
+ AppCompatTextView providerHeaderText;
+
+ public ProviderHeaderView(Context context) {
+ super(context);
+ initLayout(context);
+ }
+
+ public ProviderHeaderView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ initLayout(context);
+ }
+
+ public ProviderHeaderView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ initLayout(context);
+ }
+
+ @RequiresApi(21)
+ public ProviderHeaderView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ initLayout(context);
+ }
+
+
+ void initLayout(Context context) {
+ LayoutInflater inflater = (LayoutInflater) context
+ .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ View rootview = inflater.inflate(R.layout.v_provider_header, this, true);
+ providerHeaderLogo = rootview.findViewById(R.id.provider_header_logo);
+ providerHeaderText = rootview.findViewById(R.id.provider_header_text);
+
+ stdPadding = convertDimensionToPx(context, R.dimen.stdpadding);
+ compactPadding = convertDimensionToPx(context, R.dimen.compact_padding);
+ stdImageSize = convertDimensionToPx(context, R.dimen.bitmask_logo);
+ compactImageSize = convertDimensionToPx(context, R.dimen.bitmask_logo_compact);
+ }
+
+ public void setTitle(String title) {
+ providerHeaderText.setText(title);
+ }
+
+ public void setTitle(@StringRes int stringRes) {
+ providerHeaderText.setText(stringRes);
+ }
+
+ public void setLogo(@DrawableRes int drawableRes) {
+ providerHeaderLogo.setImageResource(drawableRes);
+ }
+
+ public void showCompactLayout() {
+ LayoutParams logoLayoutParams = (LayoutParams) providerHeaderLogo.getLayoutParams();
+ logoLayoutParams.width = compactImageSize;
+ logoLayoutParams.height = compactImageSize;
+ providerHeaderLogo.setLayoutParams(logoLayoutParams);
+
+ LayoutParams textLayoutParams = (LayoutParams) providerHeaderText.getLayoutParams();
+ textLayoutParams.addRule(RIGHT_OF, R.id.provider_header_logo);
+ textLayoutParams.addRule(BELOW, 0);
+ textLayoutParams.addRule(ALIGN_TOP, R.id.provider_header_logo);
+ textLayoutParams.setMargins(compactPadding, compactPadding, compactPadding, compactPadding);
+
+ providerHeaderText.setLayoutParams(textLayoutParams);
+ providerHeaderText.setMaxLines(2);
+ }
+
+ public void showStandardLayout() {
+ LayoutParams logoLayoutParams = (LayoutParams) providerHeaderLogo.getLayoutParams();
+ logoLayoutParams.width = stdImageSize;
+ logoLayoutParams.height = stdImageSize;
+ providerHeaderLogo.setLayoutParams(logoLayoutParams);
+
+ LayoutParams textLayoutParams = (LayoutParams) providerHeaderText.getLayoutParams();
+ textLayoutParams.addRule(RIGHT_OF, 0);
+ textLayoutParams.addRule(BELOW, R.id.provider_header_logo);
+ textLayoutParams.addRule(ALIGN_TOP, 0);
+ textLayoutParams.setMargins(stdPadding, stdPadding, stdPadding, stdPadding);
+ providerHeaderText.setLayoutParams(textLayoutParams);
+ providerHeaderText.setMaxLines(1);
+ }
+
+}