summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/base
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2024-12-07 16:01:10 +0100
committercyberta <cyberta@riseup.net>2024-12-11 00:09:34 +0000
commit4fd0c5e51ad3fa0d5696f726e5966503325c046d (patch)
tree2441e7fefc14f2425a0614e1889fbffb63b93fba /app/src/main/java/se/leap/bitmaskclient/base
parentdaa7b6fd567a5037a85a11f6c601997c37b42c53 (diff)
set introducer URL in bitmask-core during provider setup, in case there's an invite code present
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/models/Introducer.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Introducer.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Introducer.java
index c31912d9..671992ca 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Introducer.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Introducer.java
@@ -29,6 +29,10 @@ public class Introducer implements Parcelable {
kcpEnabled = in.readByte() != 0;
}
+ public String getFullyQualifiedDomainName() {
+ return fullyQualifiedDomainName;
+ }
+
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(type);
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
index ac3aba7a..5b5fac48 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/Provider.java
@@ -135,7 +135,7 @@ public final class Provider implements Parcelable {
public Provider() { }
public Provider(Introducer introducer) {
- this(introducer.toUrl(), null);
+ this("https://" + introducer.getFullyQualifiedDomainName());
this.introducer = introducer;
}