parse install referrer from gplay
This commit is contained in:
parent
6025e5de28
commit
9653d68bdd
|
@ -11,32 +11,42 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.WelcomeActivity"
|
android:name=".ui.WelcomeActivity"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:launchMode="singleTask"/>
|
android:launchMode="singleTask" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.PickServerActivity"
|
android:name=".ui.PickServerActivity"
|
||||||
android:label="@string/create_new_account"
|
android:label="@string/create_new_account"
|
||||||
android:launchMode="singleTask"/>
|
android:launchMode="singleTask" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.MagicCreateActivity"
|
android:name=".ui.MagicCreateActivity"
|
||||||
android:label="@string/create_new_account"
|
android:label="@string/create_new_account"
|
||||||
android:launchMode="singleTask"/>
|
android:launchMode="singleTask" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ui.ImportBackupActivity"
|
android:name=".ui.ImportBackupActivity"
|
||||||
android:label="@string/restore_backup"
|
android:label="@string/restore_backup"
|
||||||
android:launchMode="singleTask">
|
android:launchMode="singleTask">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.VIEW"/>
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
|
||||||
<data android:mimeType="application/vnd.conversations.backup" />
|
<data android:mimeType="application/vnd.conversations.backup" />
|
||||||
<data android:scheme="content" />
|
<data android:scheme="content" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.VIEW"/>
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
|
||||||
<data android:mimeType="application/vnd.conversations.backup" />
|
<data android:mimeType="application/vnd.conversations.backup" />
|
||||||
<data android:scheme="file" />
|
<data android:scheme="file" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<receiver
|
||||||
|
android:name=".services.InstallReferrerService"
|
||||||
|
android:enabled="true"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.android.vending.INSTALL_REFERRER" />
|
||||||
|
</intent-filter>
|
||||||
|
</receiver>
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
package eu.siacs.conversations.services;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.net.URLDecoder;
|
||||||
|
|
||||||
|
import eu.siacs.conversations.Config;
|
||||||
|
import eu.siacs.conversations.ui.StartConversationActivity;
|
||||||
|
import eu.siacs.conversations.utils.SignupUtils;
|
||||||
|
|
||||||
|
public class InstallReferrerService extends BroadcastReceiver {
|
||||||
|
|
||||||
|
public static final String INSTALL_REFERRER_BROADCAST_ACTION = "eu.siacs.conversations.install_referrer";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceive(final Context context, final Intent intent) {
|
||||||
|
final String referrer = intent == null ? null : intent.getStringExtra("referrer");
|
||||||
|
if (referrer == null) {
|
||||||
|
Log.d(Config.LOGTAG, "received empty referrer");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
final String decoded = URLDecoder.decode(referrer, "UTF-8");
|
||||||
|
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
|
preferences.edit().putString(SignupUtils.INSTALL_REFERRER, decoded).apply();
|
||||||
|
Log.d(Config.LOGTAG, "stored referrer: " + decoded);
|
||||||
|
final Intent broadcastIntent = new Intent(INSTALL_REFERRER_BROADCAST_ACTION);
|
||||||
|
broadcastIntent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, decoded);
|
||||||
|
context.sendBroadcast(broadcastIntent);
|
||||||
|
} catch (final Exception e) {
|
||||||
|
Log.d(Config.LOGTAG, "unable to process referrer", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,12 +1,15 @@
|
||||||
package eu.siacs.conversations.ui;
|
package eu.siacs.conversations.ui;
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.content.pm.ActivityInfo;
|
import android.content.pm.ActivityInfo;
|
||||||
import android.databinding.DataBindingUtil;
|
import android.databinding.DataBindingUtil;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
@ -17,6 +20,7 @@ import eu.siacs.conversations.R;
|
||||||
import eu.siacs.conversations.databinding.MagicCreateBinding;
|
import eu.siacs.conversations.databinding.MagicCreateBinding;
|
||||||
import eu.siacs.conversations.entities.Account;
|
import eu.siacs.conversations.entities.Account;
|
||||||
import eu.siacs.conversations.utils.CryptoHelper;
|
import eu.siacs.conversations.utils.CryptoHelper;
|
||||||
|
import eu.siacs.conversations.utils.SignupUtils;
|
||||||
import rocks.xmpp.addr.Jid;
|
import rocks.xmpp.addr.Jid;
|
||||||
|
|
||||||
public class MagicCreateActivity extends XmppActivity implements TextWatcher {
|
public class MagicCreateActivity extends XmppActivity implements TextWatcher {
|
||||||
|
@ -121,6 +125,14 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher {
|
||||||
binding.username.addTextChangedListener(this);
|
binding.username.addTextChangedListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
Log.d(Config.LOGTAG,"purge install referrer");
|
||||||
|
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
preferences.edit().remove(SignupUtils.INSTALL_REFERRER).apply();
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,32 @@
|
||||||
package eu.siacs.conversations.ui;
|
package eu.siacs.conversations.ui;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.IntentFilter;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.content.pm.ActivityInfo;
|
import android.content.pm.ActivityInfo;
|
||||||
import android.databinding.DataBindingUtil;
|
import android.databinding.DataBindingUtil;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import eu.siacs.conversations.Config;
|
||||||
import eu.siacs.conversations.R;
|
import eu.siacs.conversations.R;
|
||||||
import eu.siacs.conversations.databinding.ActivityWelcomeBinding;
|
import eu.siacs.conversations.databinding.ActivityWelcomeBinding;
|
||||||
import eu.siacs.conversations.entities.Account;
|
import eu.siacs.conversations.entities.Account;
|
||||||
|
import eu.siacs.conversations.services.InstallReferrerService;
|
||||||
|
import eu.siacs.conversations.utils.SignupUtils;
|
||||||
|
import eu.siacs.conversations.utils.XmppUri;
|
||||||
|
import rocks.xmpp.addr.Jid;
|
||||||
|
|
||||||
import static eu.siacs.conversations.utils.PermissionUtils.allGranted;
|
import static eu.siacs.conversations.utils.PermissionUtils.allGranted;
|
||||||
import static eu.siacs.conversations.utils.PermissionUtils.writeGranted;
|
import static eu.siacs.conversations.utils.PermissionUtils.writeGranted;
|
||||||
|
@ -24,6 +35,44 @@ public class WelcomeActivity extends XmppActivity {
|
||||||
|
|
||||||
private static final int REQUEST_IMPORT_BACKUP = 0x63fb;
|
private static final int REQUEST_IMPORT_BACKUP = 0x63fb;
|
||||||
|
|
||||||
|
private XmppUri inviteUri;
|
||||||
|
|
||||||
|
private BroadcastReceiver installReferrerBroadcastReceiver = new BroadcastReceiver() {
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent data) {
|
||||||
|
final String invite = data.getStringExtra(StartConversationActivity.EXTRA_INVITE_URI);
|
||||||
|
if (invite == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Log.d(Config.LOGTAG, "welcome activity received install referrer uri: " + invite);
|
||||||
|
final XmppUri xmppUri = new XmppUri(invite);
|
||||||
|
processXmppUri(xmppUri);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private boolean processXmppUri(final XmppUri xmppUri) {
|
||||||
|
if (xmppUri.isValidJid()) {
|
||||||
|
final String preauth = xmppUri.getParamater("preauth");
|
||||||
|
final Jid jid = xmppUri.getJid();
|
||||||
|
final Intent intent;
|
||||||
|
if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) {
|
||||||
|
intent = SignupUtils.getTokenRegistrationIntent(this, jid, preauth);
|
||||||
|
} else if (xmppUri.isAction(XmppUri.ACTION_ROSTER) && "y".equals(xmppUri.getParamater("ibr"))) {
|
||||||
|
intent = SignupUtils.getTokenRegistrationIntent(this, Jid.ofDomain(jid.getDomain()), preauth);
|
||||||
|
intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
|
||||||
|
} else {
|
||||||
|
intent = null;
|
||||||
|
}
|
||||||
|
if (intent != null) {
|
||||||
|
startActivity(intent);
|
||||||
|
finish();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
this.inviteUri = xmppUri;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void refreshUiReal() {
|
protected void refreshUiReal() {
|
||||||
|
|
||||||
|
@ -41,6 +90,15 @@ public class WelcomeActivity extends XmppActivity {
|
||||||
if (this.mTheme != theme) {
|
if (this.mTheme != theme) {
|
||||||
recreate();
|
recreate();
|
||||||
}
|
}
|
||||||
|
final IntentFilter intentFilter = new IntentFilter();
|
||||||
|
intentFilter.addAction(InstallReferrerService.INSTALL_REFERRER_BROADCAST_ACTION);
|
||||||
|
registerReceiver(installReferrerBroadcastReceiver, intentFilter);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
unregisterReceiver(installReferrerBroadcastReceiver);
|
||||||
|
super.onStop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -56,7 +114,13 @@ public class WelcomeActivity extends XmppActivity {
|
||||||
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
|
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
|
||||||
}
|
}
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
ActivityWelcomeBinding binding = DataBindingUtil.setContentView(this,R.layout.activity_welcome);
|
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
|
final String referrer = preferences.getString(SignupUtils.INSTALL_REFERRER,null);
|
||||||
|
final XmppUri referrerUri = referrer == null ? null : new XmppUri(referrer);
|
||||||
|
if (referrerUri != null && processXmppUri(referrerUri)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ActivityWelcomeBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_welcome);
|
||||||
setSupportActionBar((Toolbar) binding.toolbar);
|
setSupportActionBar((Toolbar) binding.toolbar);
|
||||||
configureActionBar(getSupportActionBar(), false);
|
configureActionBar(getSupportActionBar(), false);
|
||||||
binding.registerNewAccount.setOnClickListener(v -> {
|
binding.registerNewAccount.setOnClickListener(v -> {
|
||||||
|
@ -67,7 +131,7 @@ public class WelcomeActivity extends XmppActivity {
|
||||||
binding.useExisting.setOnClickListener(v -> {
|
binding.useExisting.setOnClickListener(v -> {
|
||||||
List<Account> accounts = xmppConnectionService.getAccounts();
|
List<Account> accounts = xmppConnectionService.getAccounts();
|
||||||
Intent intent = new Intent(WelcomeActivity.this, EditAccountActivity.class);
|
Intent intent = new Intent(WelcomeActivity.this, EditAccountActivity.class);
|
||||||
intent.putExtra(EditAccountActivity.EXTRA_FORCE_REGISTER,false);
|
intent.putExtra(EditAccountActivity.EXTRA_FORCE_REGISTER, false);
|
||||||
if (accounts.size() == 1) {
|
if (accounts.size() == 1) {
|
||||||
intent.putExtra("jid", accounts.get(0).getJid().asBareJid().toString());
|
intent.putExtra("jid", accounts.get(0).getJid().asBareJid().toString());
|
||||||
intent.putExtra("init", true);
|
intent.putExtra("init", true);
|
||||||
|
@ -117,8 +181,15 @@ public class WelcomeActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addInviteUri(Intent intent) {
|
public void addInviteUri(Intent to) {
|
||||||
StartConversationActivity.addInviteUri(intent, getIntent());
|
final Intent from = getIntent();
|
||||||
|
if (from != null && from.hasExtra(StartConversationActivity.EXTRA_INVITE_URI)) {
|
||||||
|
final String invite = from.getStringExtra(StartConversationActivity.EXTRA_INVITE_URI);
|
||||||
|
to.putExtra(StartConversationActivity.EXTRA_INVITE_URI, invite);
|
||||||
|
} else if (this.inviteUri != null) {
|
||||||
|
Log.d(Config.LOGTAG,"injecting referrer uri into on-boarding flow");
|
||||||
|
to.putExtra(StartConversationActivity.EXTRA_INVITE_URI, this.inviteUri.toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void launch(AppCompatActivity activity) {
|
public static void launch(AppCompatActivity activity) {
|
||||||
|
|
|
@ -17,6 +17,8 @@ import rocks.xmpp.addr.Jid;
|
||||||
|
|
||||||
public class SignupUtils {
|
public class SignupUtils {
|
||||||
|
|
||||||
|
public static final String INSTALL_REFERRER = "install_referrer";
|
||||||
|
|
||||||
public static boolean isSupportTokenRegistry() {
|
public static boolean isSupportTokenRegistry() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,7 @@ public class PresenceParser extends AbstractParser implements
|
||||||
final Jid alternate;
|
final Jid alternate;
|
||||||
if (gone != null) {
|
if (gone != null) {
|
||||||
final XmppUri xmppUri = new XmppUri(gone);
|
final XmppUri xmppUri = new XmppUri(gone);
|
||||||
if (xmppUri.isJidValid()) {
|
if (xmppUri.isValidJid()) {
|
||||||
alternate = xmppUri.getJid();
|
alternate = xmppUri.getJid();
|
||||||
} else {
|
} else {
|
||||||
alternate = null;
|
alternate = null;
|
||||||
|
|
|
@ -348,7 +348,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity im
|
||||||
if (activityResult.resultCode == RESULT_OK && activityResult.requestCode == ScanActivity.REQUEST_SCAN_QR_CODE) {
|
if (activityResult.resultCode == RESULT_OK && activityResult.requestCode == ScanActivity.REQUEST_SCAN_QR_CODE) {
|
||||||
String result = activityResult.data.getStringExtra(ScanActivity.INTENT_EXTRA_RESULT);
|
String result = activityResult.data.getStringExtra(ScanActivity.INTENT_EXTRA_RESULT);
|
||||||
XmppUri uri = new XmppUri(result == null ? "" : result);
|
XmppUri uri = new XmppUri(result == null ? "" : result);
|
||||||
if (uri.isJidValid()) {
|
if (uri.isValidJid()) {
|
||||||
showEnterJidDialog(uri);
|
showEnterJidDialog(uri);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,12 +41,10 @@ import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.databinding.DataBindingUtil;
|
import android.databinding.DataBindingUtil;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.support.annotation.IdRes;
|
import android.support.annotation.IdRes;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.annotation.RequiresApi;
|
|
||||||
import android.support.v7.app.ActionBar;
|
import android.support.v7.app.ActionBar;
|
||||||
import android.support.v7.app.AlertDialog;
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.widget.Toolbar;
|
import android.support.v7.widget.Toolbar;
|
||||||
|
@ -73,7 +71,6 @@ import eu.siacs.conversations.ui.interfaces.OnConversationArchived;
|
||||||
import eu.siacs.conversations.ui.interfaces.OnConversationRead;
|
import eu.siacs.conversations.ui.interfaces.OnConversationRead;
|
||||||
import eu.siacs.conversations.ui.interfaces.OnConversationSelected;
|
import eu.siacs.conversations.ui.interfaces.OnConversationSelected;
|
||||||
import eu.siacs.conversations.ui.interfaces.OnConversationsListItemUpdated;
|
import eu.siacs.conversations.ui.interfaces.OnConversationsListItemUpdated;
|
||||||
import eu.siacs.conversations.ui.service.EmojiService;
|
|
||||||
import eu.siacs.conversations.ui.util.ActivityResult;
|
import eu.siacs.conversations.ui.util.ActivityResult;
|
||||||
import eu.siacs.conversations.ui.util.ConversationMenuConfigurator;
|
import eu.siacs.conversations.ui.util.ConversationMenuConfigurator;
|
||||||
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
|
import eu.siacs.conversations.ui.util.MenuDoubleTabUtil;
|
||||||
|
@ -460,7 +457,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
||||||
|
|
||||||
public boolean onXmppUriClicked(Uri uri) {
|
public boolean onXmppUriClicked(Uri uri) {
|
||||||
XmppUri xmppUri = new XmppUri(uri);
|
XmppUri xmppUri = new XmppUri(uri);
|
||||||
if (xmppUri.isJidValid() && !xmppUri.hasFingerprints()) {
|
if (xmppUri.isValidJid() && !xmppUri.hasFingerprints()) {
|
||||||
final Conversation conversation = xmppConnectionService.findUniqueConversationByJid(xmppUri);
|
final Conversation conversation = xmppConnectionService.findUniqueConversationByJid(xmppUri);
|
||||||
if (conversation != null) {
|
if (conversation != null) {
|
||||||
openConversation(conversation, null);
|
openConversation(conversation, null);
|
||||||
|
|
|
@ -823,7 +823,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
|
||||||
if (inviteUri != null) {
|
if (inviteUri != null) {
|
||||||
final Invite invite = new Invite(inviteUri);
|
final Invite invite = new Invite(inviteUri);
|
||||||
invite.account = intent.getStringExtra(EXTRA_ACCOUNT);
|
invite.account = intent.getStringExtra(EXTRA_ACCOUNT);
|
||||||
if (invite.isJidValid()) {
|
if (invite.isValidJid()) {
|
||||||
return invite.invite();
|
return invite.invite();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1020,7 +1020,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
|
||||||
conferenceJid = Jid.of(input);
|
conferenceJid = Jid.of(input);
|
||||||
} catch (final IllegalArgumentException e) {
|
} catch (final IllegalArgumentException e) {
|
||||||
final XmppUri xmppUri = new XmppUri(input);
|
final XmppUri xmppUri = new XmppUri(input);
|
||||||
if (xmppUri.isJidValid() && xmppUri.isAction(XmppUri.ACTION_JOIN)) {
|
if (xmppUri.isValidJid() && xmppUri.isAction(XmppUri.ACTION_JOIN)) {
|
||||||
final Editable editable = jid.getEditableText();
|
final Editable editable = jid.getEditableText();
|
||||||
editable.clear();
|
editable.clear();
|
||||||
editable.append(xmppUri.getJid().toEscapedString());
|
editable.append(xmppUri.getJid().toEscapedString());
|
||||||
|
@ -1301,7 +1301,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean invite() {
|
boolean invite() {
|
||||||
if (!isJidValid()) {
|
if (!isValidJid()) {
|
||||||
Toast.makeText(StartConversationActivity.this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
|
Toast.makeText(StartConversationActivity.this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,14 +9,12 @@ import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.util.Log;
|
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import eu.siacs.conversations.Config;
|
|
||||||
import eu.siacs.conversations.R;
|
import eu.siacs.conversations.R;
|
||||||
import eu.siacs.conversations.persistance.DatabaseBackend;
|
import eu.siacs.conversations.persistance.DatabaseBackend;
|
||||||
import eu.siacs.conversations.utils.SignupUtils;
|
import eu.siacs.conversations.utils.SignupUtils;
|
||||||
|
@ -89,7 +87,7 @@ public class UriHandlerActivity extends AppCompatActivity {
|
||||||
final XmppUri xmppUri = new XmppUri(uri);
|
final XmppUri xmppUri = new XmppUri(uri);
|
||||||
final List<Jid> accounts = DatabaseBackend.getInstance(this).getAccountJids(true);
|
final List<Jid> accounts = DatabaseBackend.getInstance(this).getAccountJids(true);
|
||||||
|
|
||||||
if (SignupUtils.isSupportTokenRegistry() && xmppUri.isJidValid()) {
|
if (SignupUtils.isSupportTokenRegistry() && xmppUri.isValidJid()) {
|
||||||
final String preauth = xmppUri.getParamater("preauth");
|
final String preauth = xmppUri.getParamater("preauth");
|
||||||
final Jid jid = xmppUri.getJid();
|
final Jid jid = xmppUri.getJid();
|
||||||
if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) {
|
if (xmppUri.isAction(XmppUri.ACTION_REGISTER)) {
|
||||||
|
@ -110,7 +108,7 @@ public class UriHandlerActivity extends AppCompatActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (accounts.size() == 0) {
|
if (accounts.size() == 0) {
|
||||||
if (xmppUri.isJidValid()) {
|
if (xmppUri.isValidJid()) {
|
||||||
intent = SignupUtils.getSignUpIntent(this);
|
intent = SignupUtils.getSignUpIntent(this);
|
||||||
intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
|
intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
|
@ -157,7 +155,7 @@ public class UriHandlerActivity extends AppCompatActivity {
|
||||||
intent.putExtra("jid", xmppUri.getJid().asBareJid().toString());
|
intent.putExtra("jid", xmppUri.getJid().asBareJid().toString());
|
||||||
intent.setData(uri);
|
intent.setData(uri);
|
||||||
intent.putExtra("scanned", scanned);
|
intent.putExtra("scanned", scanned);
|
||||||
} else if (xmppUri.isJidValid()) {
|
} else if (xmppUri.isValidJid()) {
|
||||||
intent = new Intent(getApplicationContext(), StartConversationActivity.class);
|
intent = new Intent(getApplicationContext(), StartConversationActivity.class);
|
||||||
intent.setAction(Intent.ACTION_VIEW);
|
intent.setAction(Intent.ACTION_VIEW);
|
||||||
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||||
|
|
|
@ -91,7 +91,7 @@ public class MyLinkify {
|
||||||
|
|
||||||
private static final Linkify.MatchFilter XMPPURI_MATCH_FILTER = (s, start, end) -> {
|
private static final Linkify.MatchFilter XMPPURI_MATCH_FILTER = (s, start, end) -> {
|
||||||
XmppUri uri = new XmppUri(s.subSequence(start, end).toString());
|
XmppUri uri = new XmppUri(s.subSequence(start, end).toString());
|
||||||
return uri.isJidValid();
|
return uri.isValidJid();
|
||||||
};
|
};
|
||||||
|
|
||||||
private static boolean isAlphabetic(final int code) {
|
private static boolean isAlphabetic(final int code) {
|
||||||
|
|
|
@ -132,7 +132,7 @@ public class ShareUtil {
|
||||||
Matcher xmppPatternMatcher = Patterns.XMPP_PATTERN.matcher(body);
|
Matcher xmppPatternMatcher = Patterns.XMPP_PATTERN.matcher(body);
|
||||||
if (xmppPatternMatcher.find()) {
|
if (xmppPatternMatcher.find()) {
|
||||||
try {
|
try {
|
||||||
return new XmppUri(body.substring(xmppPatternMatcher.start(), xmppPatternMatcher.end())).isJidValid();
|
return new XmppUri(body.substring(xmppPatternMatcher.start(), xmppPatternMatcher.end())).isValidJid();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -176,7 +176,7 @@ public class XmppUri {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isJidValid() {
|
public boolean isValidJid() {
|
||||||
if (jid == null) {
|
if (jid == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue