From 074e285c94a752609c6b6e8f079db26bd9d77f0f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 27 Jan 2025 15:57:31 +0100 Subject: add auth token to introducer model class, pass auth token to bitmask-core --- .../leap/bitmaskclient/providersetup/ProviderApiManager.java | 1 + .../providersetup/fragments/ProviderSelectionFragment.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup') diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java index b370f0f6..79c6f5c4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManager.java @@ -150,6 +150,7 @@ public class ProviderApiManager extends ProviderApiManagerBase { } return bm.getProvider(); } catch (Exception e) { + e.printStackTrace(); try { if (allowRetry && TorStatusObservable.getStatus() == OFF && diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java index 3a75925e..66b1dd00 100644 --- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ProviderSelectionFragment.java @@ -20,6 +20,7 @@ import androidx.lifecycle.ViewModelProvider; import com.journeyapps.barcodescanner.ScanContract; import com.journeyapps.barcodescanner.ScanOptions; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import se.leap.bitmaskclient.R; @@ -61,6 +62,7 @@ public class ProviderSelectionFragment extends BaseSetupFragment implements Canc Introducer introducer = Introducer.fromUrl(result.getContents()); binding.editCustomProvider.setText(introducer.toUrl()); } catch (Exception e) { + e.printStackTrace(); //binding.editCustomProvider.setText(result.getContents()); } } @@ -191,8 +193,12 @@ public class ProviderSelectionFragment extends BaseSetupFragment implements Canc public void providerSelectionChanged(){ Provider provider = setupActivityCallback.getSelectedProvider(); if (provider != null && provider.hasIntroducer()) { - binding.providerRadioGroup.check(INVITE_CODE_PROVIDER); - binding.editCustomProvider.setText(provider.getIntroducer().toUrl()); + try { + binding.providerRadioGroup.check(INVITE_CODE_PROVIDER); + binding.editCustomProvider.setText(provider.getIntroducer().toUrl()); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } } else { binding.providerRadioGroup.check(viewModel.getSelected()); } -- cgit v1.2.3