fixed links in privacy warning in channel discovery
This commit is contained in:
parent
7d7835e035
commit
0a6879eea5
2 changed files with 10 additions and 2 deletions
src/main/java/de/pixart/messenger/ui
|
@ -8,6 +8,7 @@ import android.net.Uri;
|
|||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.text.Html;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
@ -158,6 +159,13 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
|
|||
builder.setPositiveButton(R.string.confirm, (dialog, which) -> optIn());
|
||||
builder.setOnCancelListener(dialog -> finish());
|
||||
final AlertDialog dialog = builder.create();
|
||||
dialog.setOnShowListener(d -> {
|
||||
final TextView textView = dialog.findViewById(android.R.id.message);
|
||||
if (textView == null) {
|
||||
return;
|
||||
}
|
||||
textView.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
});
|
||||
dialog.setCanceledOnTouchOutside(false);
|
||||
dialog.show();
|
||||
}
|
||||
|
|
|
@ -67,8 +67,8 @@ public class FixedURLSpan extends URLSpan {
|
|||
public void onClick(View widget) {
|
||||
final Uri uri = Uri.parse(getURL());
|
||||
final Context context = widget.getContext();
|
||||
final boolean candidateToProcessDirecty = "xmpp".equals(uri.getScheme()) || ("https".equals(uri.getScheme()) && Config.inviteHostURL.equals(uri.getHost()) && uri.getPathSegments().size() > 1 && Arrays.asList("j", "i").contains(uri.getPathSegments().get(0)));
|
||||
if (candidateToProcessDirecty && context instanceof ConversationsActivity) {
|
||||
final boolean candidateToProcessDirectly = "xmpp".equals(uri.getScheme()) || ("https".equals(uri.getScheme()) && Config.inviteHostURL.equals(uri.getHost()) && uri.getPathSegments().size() > 1 && Arrays.asList("j", "i").contains(uri.getPathSegments().get(0)));
|
||||
if (candidateToProcessDirectly && context instanceof ConversationsActivity) {
|
||||
if (((ConversationsActivity) context).onXmppUriClicked(uri)) {
|
||||
widget.playSoundEffect(0);
|
||||
return;
|
||||
|
|
Reference in a new issue