#8896 skip onboarding for custom branded apps, allow to specify if anonymous usage is preferred over login/signup

1 files changed, 114 insertions, 1 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java
index 3d4f801b..3763f506 100644
--- a/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java
@@ -1,8 +1,121 @@
+/**
+ * Copyright (c) 2018 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.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
+import static se.leap.bitmaskclient.ProviderAPI.SET_UP_PROVIDER;
+import static se.leap.bitmaskclient.ProviderSetupInterface.ProviderConfigState.SETTING_UP_PROVIDER;
+import static se.leap.bitmaskclient.utils.ConfigHelper.preferAnonymousUsage;
+
 /**
  * Created by cyberta on 17.08.18.
  */
 
-public class CustomProviderSetupActivity {
+public class CustomProviderSetupActivity extends ProviderSetupBaseActivity {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setUpInitialUI();
+        restoreState(savedInstanceState);
+        setProvider(new Provider(BuildConfig.customProviderUrl));
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (getConfigState() == ProviderConfigState.PROVIDER_NOT_SET) {
+            showProgressBar();
+            setupProvider();
+        }
+    }
+
+    private void setUpInitialUI() {
+        setContentView(R.layout.a_custom_provider_setup);
+        setProviderHeaderText(R.string.setup_provider);
+        hideProgressBar();
+    }
+
+    private void setupProvider() {
+        setProviderConfigState(SETTING_UP_PROVIDER);
+        ProviderAPICommand.execute(this, SET_UP_PROVIDER, getProvider());
+    }
+
+    // ------- ProviderSetupInterface ---v
+    @Override
+    public void handleProviderSetUp(Provider provider) {
+        setProvider(provider);
+        if (provider.allowsAnonymous()) {
+            downloadVpnCertificate();
+        } else {
+            showProviderDetails();
+        }
+    }
+
+    @Override
+    public void handleCorrectlyDownloadedCertificate(Provider provider) {
+        if (preferAnonymousUsage()) {
+            finishWithSetupWithProvider(provider);
+        } else {
+            this.provider = provider;
+            showProviderDetails();
+        }
+    }
+
+    // ------- DownloadFailedDialogInterface ---v
+    @Override
+    public void retrySetUpProvider(@NonNull Provider provider) {
+        setupProvider();
+        showProgressBar();
+    }
+
+    @Override
+    public void cancelSettingUpProvider() {
+        super.cancelSettingUpProvider();
+        finish();
+    }
+
+    @Override
+    public void addAndSelectNewProvider(String url) {
+        // ignore
+    }
+
+    private void finishWithSetupWithProvider(Provider provider) {
+        Intent intent = new Intent();
+        intent.putExtra(Provider.KEY, provider);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+
+    @Override
+    public void onReceiveResult(int resultCode, Bundle resultData) {
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_CONFIGURE_LEAP) {
+            setResult(resultCode, data);
+            finish();
+        }
+    }
 }