diff options
Diffstat (limited to 'app/src/main/java/se')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java | 92 | ||||
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupInterface.java | 43 |
2 files changed, 0 insertions, 135 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java deleted file mode 100644 index 4b8e8e18..00000000 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiSetupBroadcastReceiver.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * 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.providersetup; - -import static android.app.Activity.RESULT_CANCELED; - -import static se.leap.bitmaskclient.base.models.Constants.PROVIDER_KEY; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import androidx.core.os.BundleCompat; - -import java.lang.ref.WeakReference; - -import se.leap.bitmaskclient.base.models.Constants; -import se.leap.bitmaskclient.base.models.Provider; -import se.leap.bitmaskclient.providersetup.ProviderSetupInterface.ProviderConfigState; - -/** - * Broadcast receiver that handles callback intents of ProviderApi during provider setup. - * It is used by CustomProviderSetupActivity for custom branded apps and ProviderListActivity - * for 'normal' Bitmask. - * - * Created by cyberta on 17.08.18. - */ - -public class ProviderApiSetupBroadcastReceiver extends BroadcastReceiver { - private static final String TAG = ProviderApiSetupBroadcastReceiver.class.getSimpleName(); - private final WeakReference<ProviderSetupInterface> setupInterfaceRef; - - public ProviderApiSetupBroadcastReceiver(ProviderSetupInterface setupInterface) { - this.setupInterfaceRef = new WeakReference<>(setupInterface); - } - - @Override - public void onReceive(Context context, Intent intent) { - Log.d(TAG, "received Broadcast"); - ProviderSetupInterface setupInterface = setupInterfaceRef.get(); - String action = intent.getAction(); - if (action == null || !action.equalsIgnoreCase(Constants.BROADCAST_PROVIDER_API_EVENT) || setupInterface == null) { - return; - } - - if (setupInterface.getConfigState() != null && - setupInterface.getConfigState() == ProviderConfigState.SETTING_UP_PROVIDER) { - int resultCode = intent.getIntExtra(Constants.BROADCAST_RESULT_CODE, RESULT_CANCELED); - Log.d(TAG, "Broadcast resultCode: " + resultCode); - - Bundle resultData = intent.getParcelableExtra(Constants.BROADCAST_RESULT_KEY); - Provider handledProvider = resultData == null ? null : BundleCompat.getParcelable(resultData, PROVIDER_KEY, Provider.class); - - if (handledProvider != null && setupInterface.getProvider() != null && - handledProvider.getMainUrl().equalsIgnoreCase(setupInterface.getProvider().getMainUrl())) { - switch (resultCode) { - case ProviderAPI.PROVIDER_OK: - setupInterface.handleProviderSetUp(handledProvider); - break; - case ProviderAPI.MISSING_NETWORK_CONNECTION: - case ProviderAPI.TOR_TIMEOUT: - case ProviderAPI.PROVIDER_NOK: - setupInterface.handleError(resultData); - break; - case ProviderAPI.CORRECTLY_DOWNLOADED_VPN_CERTIFICATE: - setupInterface.handleCorrectlyDownloadedCertificate(handledProvider); - break; - case ProviderAPI.INCORRECTLY_DOWNLOADED_VPN_CERTIFICATE: - setupInterface.handleIncorrectlyDownloadedCertificate(); - break; - } - } - } - } - -}
\ No newline at end of file diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupInterface.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupInterface.java deleted file mode 100644 index 0c60a3ce..00000000 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupInterface.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 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.providersetup; - -import android.os.Bundle; - -import se.leap.bitmaskclient.base.models.Provider; - -/** - * Created by cyberta on 17.08.18. - */ - -public interface ProviderSetupInterface { - enum ProviderConfigState { - PROVIDER_NOT_SET, - SETTING_UP_PROVIDER, - SHOWING_PROVIDER_DETAILS, - PENDING_SHOW_PROVIDER_DETAILS, - PENDING_SHOW_FAILED_DIALOG, - SHOW_FAILED_DIALOG, - } - - void handleProviderSetUp(Provider provider); - void handleError(Bundle resultData); - void handleCorrectlyDownloadedCertificate(Provider provider); - void handleIncorrectlyDownloadedCertificate(); - Provider getProvider(); - ProviderConfigState getConfigState(); -} |