Remove remote fetch accounts (d58a92f1) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -150,8 +150,6 @@ public class ProfileActivity extends BaseActivity {
		account_id = b.getString(Helper.ARG_USER_ID, null);
		mention_str = b.getString(Helper.ARG_MENTION, null);
		}


		postponeEnterTransition();

		//Remove title
		@@ -365,7 +363,9 @@ public class ProfileActivity extends BaseActivity {
		binding.accountDn.setText(account.username);
		} else {
		Spannable textAccount = account.span_display_name != null ? account.span_display_name : new SpannableString(account.display_name);
		CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textAccount, binding.accountDn, null, null);
		CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textAccount, binding.accountDn, null, id -> {
		binding.accountDn.invalidate();
		});
		binding.accountDn.setText(textAccount, TextView.BufferType.SPANNABLE);
		}

		@@ -386,7 +386,7 @@ public class ProfileActivity extends BaseActivity {
		textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note, Html.FROM_HTML_MODE_COMPACT));
		else
		textNote = account.span_note != null ? account.span_note : new SpannableString(Html.fromHtml(account.note));
		CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textNote, binding.accountNote, null, null);
		CustomEmoji.displayEmoji(ProfileActivity.this, account.emojis, textNote, binding.accountNote, null, id -> binding.accountNote.invalidate());
		binding.accountNote.setText(textNote, TextView.BufferType.SPANNABLE);
		binding.accountNote.setMovementMethod(LinkMovementMethod.getInstance());

app/src/main/java/app/fedilab/android/helper/SpannableHelper.java

+99 −135

Original line number	Diff line number	Diff line
		@@ -123,6 +123,102 @@ public class SpannableHelper {
		content.removeSpan(span);
		}

		// --- For all patterns defined in Helper class ---
		for (Map.Entry<Helper.PatternType, Pattern> entry : Helper.patternHashMap.entrySet()) {
		Helper.PatternType patternType = entry.getKey();
		Pattern pattern = entry.getValue();
		Matcher matcher = pattern.matcher(content);
		while (matcher.find()) {
		int matchStart = matcher.start();
		int matchEnd = matcher.end();
		String word = content.toString().substring(matchStart, matchEnd);
		if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {
		URLSpan[] span = content.getSpans(matchStart, matchEnd, URLSpan.class);
		content.removeSpan(span);
		content.setSpan(new ClickableSpan() {
		@Override
		public void onClick(@NonNull View textView) {
		textView.setTag(CLICKABLE_SPAN);
		switch (patternType) {
		case TAG:
		Intent intent = new Intent(context, HashTagActivity.class);
		Bundle b = new Bundle();
		b.putString(Helper.ARG_SEARCH_KEYWORD, word.trim());
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		case GROUP:
		break;
		case MENTION:
		intent = new Intent(context, ProfileActivity.class);
		b = new Bundle();
		Mention targetedMention = null;
		HashMap<String, Integer> countUsername = new HashMap<>();

		for (Mention mention : status.mentions) {
		Integer count = countUsername.get(mention.username);
		if (count == null) {
		count = 0;
		}
		if (countUsername.containsKey(mention.username)) {
		countUsername.put(mention.username, count + 1);
		} else {
		countUsername.put(mention.username, 1);
		}
		}
		for (Mention mention : status.mentions) {
		Integer count = countUsername.get(mention.username);
		if (count == null) {
		count = 0;
		}
		if (word.trim().compareToIgnoreCase("@" + mention.username) == 0 && count == 1) {
		targetedMention = mention;
		break;
		}
		}
		if (targetedMention != null) {
		b.putString(Helper.ARG_USER_ID, targetedMention.id);
		} else {
		b.putString(Helper.ARG_MENTION, word.trim());
		}

		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		case MENTION_LONG:
		intent = new Intent(context, ProfileActivity.class);
		b = new Bundle();
		targetedMention = null;
		for (Mention mention : status.mentions) {
		if (word.trim().substring(1).compareToIgnoreCase("@" + mention.acct) == 0) {
		targetedMention = mention;
		break;
		}
		}
		if (targetedMention != null) {
		b.putString(Helper.ARG_USER_ID, targetedMention.id);
		} else {
		b.putString(Helper.ARG_MENTION, word.trim());
		}
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		}
		}

		@Override
		public void updateDrawState(@NonNull TextPaint ds) {
		super.updateDrawState(ds);
		ds.setUnderlineText(false);
		ds.setColor(linkColor);
		}
		}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
		}
		}
		}
		//--- URLs ----
		Matcher matcherLink = Patterns.WEB_URL.matcher(content);
		int offSetTruncate = 0;
		@@ -166,6 +262,7 @@ public class SpannableHelper {
		}
		}


		if (matchEnd <= content.length() && matchEnd >= matchStart) {
		content.setSpan(new LongClickableSpan() {
		@Override
		@@ -300,48 +397,9 @@ public class SpannableHelper {
		@Override
		public void onClick(@NonNull View textView) {
		textView.setTag(CLICKABLE_SPAN);
		Pattern link = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w._-][0-9])(/[0-9]+)?$");
		Matcher matcherLink = link.matcher(url);
		if (matcherLink.find() && !url.contains("medium.com")) {
		if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
		CrossActionHelper.fetchRemoteStatus(context, currentAccount, url, new CrossActionHelper.Callback() {
		@Override
		public void federatedStatus(Status status) {
		Intent intent = new Intent(context, ContextActivity.class);
		intent.putExtra(Helper.ARG_STATUS, status);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		}

		@Override
		public void federatedAccount(Account account) {

		}
		});
		} else {//It's an account
		CrossActionHelper.fetchRemoteAccount(context, currentAccount, status.account, new CrossActionHelper.Callback() {
		@Override
		public void federatedStatus(Status status) {

		}

		@Override
		public void federatedAccount(Account account) {
		Intent intent = new Intent(context, ProfileActivity.class);
		Bundle b = new Bundle();
		b.putSerializable(Helper.ARG_ACCOUNT, account);
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		}
		});
		}
		} else {
		Helper.openBrowser(context, newURL);
		}

		}

		@Override
		public void updateDrawState(@NonNull TextPaint ds) {
		super.updateDrawState(ds);
		@@ -352,102 +410,7 @@ public class SpannableHelper {
		}
		}

		// --- For all patterns defined in Helper class ---
		for (Map.Entry<Helper.PatternType, Pattern> entry : Helper.patternHashMap.entrySet()) {
		Helper.PatternType patternType = entry.getKey();
		Pattern pattern = entry.getValue();
		Matcher matcher = pattern.matcher(content);
		while (matcher.find()) {

		int matchStart = matcher.start();
		int matchEnd = matcher.end();
		String word = content.toString().substring(matchStart, matchEnd);
		if (matchStart >= 0 && matchEnd <= content.toString().length() && matchEnd >= matchStart) {
		URLSpan[] span = content.getSpans(matchStart, matchEnd, URLSpan.class);
		content.removeSpan(span);

		content.setSpan(new ClickableSpan() {
		@Override
		public void onClick(@NonNull View textView) {
		textView.setTag(CLICKABLE_SPAN);
		switch (patternType) {
		case TAG:
		Intent intent = new Intent(context, HashTagActivity.class);
		Bundle b = new Bundle();
		b.putString(Helper.ARG_SEARCH_KEYWORD, word.trim());
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		case GROUP:
		break;
		case MENTION:
		intent = new Intent(context, ProfileActivity.class);
		b = new Bundle();
		Mention targetedMention = null;
		HashMap<String, Integer> countUsername = new HashMap<>();
		for (Mention mention : status.mentions) {
		Integer count = countUsername.get(mention.username);
		if (count == null) {
		count = 0;
		}
		if (countUsername.containsKey(mention.username)) {
		countUsername.put(mention.username, count + 1);
		} else {
		countUsername.put(mention.username, 1);
		}
		}
		for (Mention mention : status.mentions) {
		Integer count = countUsername.get(mention.username);
		if (count == null) {
		count = 0;
		}
		if (word.trim().compareToIgnoreCase("@" + mention.username) == 0 && count == 1) {
		targetedMention = mention;
		break;
		}
		}
		if (targetedMention != null) {
		b.putString(Helper.ARG_USER_ID, targetedMention.id);
		} else {
		b.putString(Helper.ARG_MENTION, word.trim());
		}
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		case MENTION_LONG:
		intent = new Intent(context, ProfileActivity.class);
		b = new Bundle();
		targetedMention = null;
		for (Mention mention : status.mentions) {
		if (word.trim().substring(1).compareToIgnoreCase("@" + mention.acct) == 0) {
		targetedMention = mention;
		break;
		}
		}
		if (targetedMention != null) {
		b.putString(Helper.ARG_USER_ID, targetedMention.id);
		} else {
		b.putString(Helper.ARG_MENTION, word.trim());
		}
		intent.putExtras(b);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		context.startActivity(intent);
		break;
		}
		}

		@Override
		public void updateDrawState(@NonNull TextPaint ds) {
		super.updateDrawState(ds);
		ds.setUnderlineText(false);
		ds.setColor(linkColor);
		}
		}, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
		}
		}
		}

		Matcher matcher = Helper.ouichesPattern.matcher(content);
		while (matcher.find()) {
		@@ -803,6 +766,7 @@ public class SpannableHelper {
		break;
		}
		}

		if (targetedMention != null) {
		b.putString(Helper.ARG_USER_ID, targetedMention.id);
		} else {

app/src/main/java/app/fedilab/android/ui/drawer/NotificationAdapter.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,11 @@ public class NotificationAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
		if (getItemViewType(position) == TYPE_FOLLOW \|\| getItemViewType(position) == TYPE_FOLLOW_REQUEST) {
		ViewHolderFollow holderFollow = (ViewHolderFollow) viewHolder;
		MastodonHelper.loadPPMastodon(holderFollow.binding.avatar, notification.account);
		if (notification.account.span_display_name == null && notification.account.display_name != null) {
		notification.account.span_display_name = new SpannableString(notification.account.display_name);
		} else {
		notification.account.span_display_name = new SpannableString(notification.account.username);
		}
		CustomEmoji.displayEmoji(context, notification.account.emojis, notification.account.span_display_name, holderFollow.binding.displayName, notification.id, id -> {
		if (!notification.account.emojiFetched) {
		notification.account.emojiFetched = true;