share xmpp uri if landing url is not available

Daniel Gultsch created 5 years ago

Change summary

src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java | 10 
src/main/java/eu/siacs/conversations/utils/EasyOnboardingInvite.java               |  9 
2 files changed, 6 insertions(+), 13 deletions(-)

Detailed changes

src/conversations/java/eu/siacs/conversations/ui/EasyOnboardingInviteActivity.java

@@ -68,7 +68,7 @@ public class EasyOnboardingInviteActivity extends XmppActivity implements EasyOn
         final String shareText = getString(
                 R.string.easy_invite_share_text,
                 easyOnboardingInvite.getDomain(),
-                easyOnboardingInvite.getLandingUrl()
+                easyOnboardingInvite.getShareableLink()
         );
         final Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
@@ -99,13 +99,7 @@ public class EasyOnboardingInviteActivity extends XmppActivity implements EasyOn
         final Point size = new Point();
         getWindowManager().getDefaultDisplay().getSize(size);
         final int width = Math.min(size.x, size.y);
-        final String content;
-        if (Strings.isNullOrEmpty(invite.getLandingUrl())) {
-            content = invite.getUri();
-        } else {
-            content = invite.getLandingUrl();
-        }
-        final Bitmap bitmap = BarcodeProvider.create2dBarcodeBitmap(content, width);
+        final Bitmap bitmap = BarcodeProvider.create2dBarcodeBitmap(invite.getShareableLink(), width);
         binding.qrCode.setImageBitmap(bitmap);
     }
 

src/main/java/eu/siacs/conversations/utils/EasyOnboardingInvite.java

@@ -3,6 +3,7 @@ package eu.siacs.conversations.utils;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 
 import java.util.Collections;
@@ -75,14 +76,12 @@ public class EasyOnboardingInvite implements Parcelable {
         return supportingAccountsBuilder.build();
     }
 
-    public String getUri() {
-        return uri;
-    }
 
-    public String getLandingUrl() {
-        return landingUrl;
+    public String getShareableLink() {
+        return Strings.isNullOrEmpty(landingUrl) ? uri : landingUrl;
     }
 
+
     public String getDomain() {
         return domain;
     }