From f588edd39ed7999304aac68c4ccf84f66a087cef Mon Sep 17 00:00:00 2001 From: tom79 Date: Wed, 8 Apr 2020 15:29:02 +0200 Subject: Remove old useless support for emoji --- .../android/activities/BaseMainActivity.java | 2 - .../android/activities/PeertubeActivity.java | 2 +- .../android/activities/ShowAccountActivity.java | 2 +- .../android/client/Entities/Notification.java | 10 ++--- .../android/drawers/AccountSearchDevAdapter.java | 6 +-- .../android/drawers/AccountsAdminListAdapter.java | 4 +- .../drawers/AccountsFollowRequestAdapter.java | 2 +- .../android/drawers/AccountsInAListAdapter.java | 2 +- .../android/drawers/AccountsListAdapter.java | 2 +- .../android/drawers/AccountsSearchAdapter.java | 2 +- .../android/drawers/NotificationsListAdapter.java | 10 ++--- .../android/drawers/PixelfedListAdapter.java | 2 +- .../android/drawers/ReportsListAdapter.java | 4 +- .../fedilab/android/drawers/SearchListAdapter.java | 4 +- .../fedilab/android/drawers/StatusListAdapter.java | 4 +- .../java/app/fedilab/android/helper/Helper.java | 47 ---------------------- .../fedilab/android/jobs/NotificationsSyncJob.java | 10 ++--- .../services/LiveNotificationDelayedService.java | 10 ++--- .../android/services/LiveNotificationService.java | 10 ++--- 19 files changed, 43 insertions(+), 92 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index c911ffa4c..b36970e4d 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -314,8 +314,6 @@ public abstract class BaseMainActivity extends BaseActivity } catch (Exception ignored) { } } - //For old Mastodon releases that can't pin, this support could be removed - Helper.fillMapEmoji(BaseMainActivity.this); //Here, the user is authenticated appBar = findViewById(R.id.appBar); Toolbar toolbar = findViewById(R.id.toolbar); diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java index 271b01193..07658a0de 100644 --- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java @@ -646,7 +646,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube if (share_details) { extra_text = "@" + peertube.getAccount().getAcct(); extra_text += "\r\n\r\n" + peertube.getName(); - extra_text += "\n\n" + Helper.shortnameToUnicode(":link:") + " " + url + "\r\n-\n"; + extra_text += "\n\n\uD83D\uDD17 " + url + "\r\n-\n"; final String contentToot; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) contentToot = Html.fromHtml(peertube.getDescription(), Html.FROM_HTML_MODE_LEGACY).toString(); diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 52f4723e9..3bcd18d25 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -592,7 +592,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt } } - account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + account_dn.setText(account.getDisplay_name()); if (!ischannel || account.getAcct().split("-").length < 4) { account_un.setText(String.format("@%s", account.getAcct())); account_un.setOnLongClickListener(v -> { diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java index 82e66ad4d..6b9f9473f 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java @@ -102,7 +102,7 @@ public class Notification implements Parcelable { switch (notification.getType()) { case "mention": if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_mention)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_mention)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_mention)); break; @@ -111,25 +111,25 @@ public class Notification implements Parcelable { break; case "reblog": if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_reblog)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_reblog)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_reblog)); break; case "favourite": if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_favourite)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_favourite)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_favourite)); break; case "follow": if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_follow)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_follow)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow)); break; case "follow_request": if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_follow_request)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_follow_request)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow_request)); break; diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java index ea00b52db..ec285f185 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java @@ -112,10 +112,10 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction if (account.getSocial() == null || !account.getSocial().contains("OPENCOLLECTIVE")) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); holder.account_un.setText(String.format("@%s", account.getAcct())); } else { - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); holder.account_un.setText(String.format("@%s", account.getAcct())); } if (account.isFollowing()) { @@ -124,7 +124,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction holder.account_follow.show(); } } else { - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); holder.account_un.setText(account.getAcct()); holder.account_follow.hide(); } diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java index e1345cbf3..3833b7aea 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsAdminListAdapter.java @@ -71,7 +71,7 @@ public class AccountsAdminListAdapter extends RecyclerView.Adapter implements On Account.makeAccountNameEmoji(context, AccountsAdminListAdapter.this, account); if (account.getdisplayNameSpan() == null || account.getdisplayNameSpan().toString().trim().equals("")) { if (account.getDisplay_name() != null && !account.getDisplay_name().trim().equals("")) - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); else if (account.getDisplay_name() != null) { holder.account_dn.setText(account.getDisplay_name().replace("@", "")); } @@ -80,7 +80,7 @@ public class AccountsAdminListAdapter extends RecyclerView.Adapter implements On if (account.getdisplayNameSpan() == null || account.getdisplayNameSpan().toString().trim().equals("")) { if (account.getDisplay_name() != null && !account.getDisplay_name().trim().equals("")) - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); else if (account.getDisplay_name() != null) { holder.account_dn.setText(account.getDisplay_name().replace("@", "")); } diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java index d3b3828fb..28248f1f7 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java @@ -87,7 +87,7 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement holder.btn_authorize.setVisibility(View.GONE); holder.btn_reject.setVisibility(View.GONE); } - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); holder.account_un.setText(account.getAcct()); //Profile picture Glide.with(holder.account_pp.getContext()) diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java index e7799fc9c..eb1edc97a 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsInAListAdapter.java @@ -89,7 +89,7 @@ public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnLi final Account account = accounts.get(position); - holder.account_un.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_un.setText(account.getDisplay_name()); holder.account_ac.setText(account.getAcct()); if (account.getDisplay_name().equals(account.getAcct())) holder.account_ac.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java index e206fd7d9..4deddb955 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java @@ -171,7 +171,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostA } if (account.getdisplayNameSpan() == null || account.getdisplayNameSpan().toString().trim().equals("")) { if (account.getDisplay_name() != null && !account.getDisplay_name().trim().equals("")) - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); else holder.account_dn.setText(account.getUsername().replace("@", "")); } else diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java index 09643163d..b91d68d11 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsSearchAdapter.java @@ -153,7 +153,7 @@ public class AccountsSearchAdapter extends ArrayAdapter implements Filt holder.account_dn.setVisibility(View.GONE); } else { holder.account_un.setText(String.format("@%s", account.getAcct())); - holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn.setText(account.getDisplay_name()); holder.account_dn.setVisibility(View.VISIBLE); } //Profile picture diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index a980c2329..bf4bca853 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -265,7 +265,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On case "mention": holder.status_action_container.setVisibility(View.VISIBLE); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_mention)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_mention)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_mention)); imgH = ContextCompat.getDrawable(context, R.drawable.ic_chat_bubble_outline); @@ -287,7 +287,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On case "reblog": holder.status_action_container.setVisibility(View.GONE); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_reblog)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_reblog)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_reblog)); imgH = ContextCompat.getDrawable(context, R.drawable.ic_repeat_head); @@ -297,7 +297,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On case "favourite": holder.status_action_container.setVisibility(View.GONE); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_favourite)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_favourite)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_favourite)); imgH = ContextCompat.getDrawable(context, R.drawable.ic_star_border_header); @@ -308,7 +308,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On holder.status_action_container.setVisibility(View.GONE); holder.status_date.setVisibility(View.GONE); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_follow_request)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_follow_request)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow_request)); imgH = ContextCompat.getDrawable(context, R.drawable.ic_follow_notif_header); @@ -318,7 +318,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On holder.status_action_container.setVisibility(View.GONE); holder.status_date.setVisibility(View.GONE); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), context.getString(R.string.notif_follow)); + typeString = String.format("%s %s", notification.getAccount().getDisplay_name(), context.getString(R.string.notif_follow)); else typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow)); imgH = ContextCompat.getDrawable(context, R.drawable.ic_follow_notif_header); diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index 4477ecd41..0c34980c9 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -840,7 +840,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context); else extra_text = "@" + extra_text; - extra_text += " " + Helper.shortnameToUnicode(":link:") + " " + url + "\r\n-\n"; + extra_text += " \uD83D\uDD17 " + url + "\r\n-\n"; final String contentToot; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString(); diff --git a/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java index dcd63603e..9c55fe476 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ReportsListAdapter.java @@ -71,7 +71,7 @@ public class ReportsListAdapter extends RecyclerView.Adapter implements OnRetrie Account.makeAccountNameEmoji(context, ReportsListAdapter.this, target_account); if (account.getdisplayNameSpan() == null || account.getdisplayNameSpan().toString().trim().equals("")) { if (account.getDisplay_name() != null && !account.getDisplay_name().trim().equals("")) - holder.account_dn_reporter.setText(Helper.shortnameToUnicode(account.getDisplay_name())); + holder.account_dn_reporter.setText(account.getDisplay_name()); else holder.account_dn_reporter.setText(account.getUsername().replace("@", "")); } else @@ -79,7 +79,7 @@ public class ReportsListAdapter extends RecyclerView.Adapter implements OnRetrie if (target_account.getdisplayNameSpan() == null || target_account.getdisplayNameSpan().toString().trim().equals("")) { if (target_account.getDisplay_name() != null && !target_account.getDisplay_name().trim().equals("")) - holder.account_dn.setText(Helper.shortnameToUnicode(target_account.getDisplay_name())); + holder.account_dn.setText(target_account.getDisplay_name()); else { if (target_account.getUsername() != null) { holder.account_dn.setText(target_account.getUsername().replace("@", "")); diff --git a/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java index e57027c7b..6ebcd3bc5 100644 --- a/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java @@ -157,7 +157,7 @@ public class SearchListAdapter extends BaseAdapter { final String content, displayName, username, ppurl; if (status.getReblog() != null) { content = status.getReblog().getContent(); - displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name()); + displayName = status.getReblog().getAccount().getDisplay_name(); username = status.getReblog().getAccount().getUsername(); holder.status_reblog_user.setText(String.format("%s @%s", displayName, username)); ppurl = status.getReblog().getAccount().getAvatar(); @@ -167,7 +167,7 @@ public class SearchListAdapter extends BaseAdapter { } else { ppurl = status.getAccount().getAvatar(); content = status.getContent(); - displayName = Helper.shortnameToUnicode(status.getAccount().getDisplay_name()); + displayName = status.getAccount().getDisplay_name(); username = status.getAccount().getUsername(); holder.status_reblog_user.setVisibility(View.GONE); holder.status_account_displayname.setText(displayName); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 4bd349527..d946a8fec 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1363,7 +1363,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context); else extra_text = "@" + extra_text; - extra_text += " " + Helper.shortnameToUnicode(":link:") + " " + url + "\r\n-\n"; + extra_text += " \uD83D\uDD17 " + url + "\r\n-\n"; final String contentToot; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString(); @@ -2940,7 +2940,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context); else extra_text = "@" + extra_text; - extra_text += " " + Helper.shortnameToUnicode(":link:") + " " + url + "\r\n-\n"; + extra_text += " \uD83D\uDD17 " + url + "\r\n-\n"; final String contentToot; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString(); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index b2cc71083..c7850d703 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -522,7 +522,6 @@ public class Helper { //Default values public final static int DEFAULT_VIDEO_WIDTH = 640; public final static int DEFAULT_VIDEO_BITRATE = 450000; - private static final Pattern SHORTNAME_PATTERN = Pattern.compile(":( |)([-+\\w]+):"); private static final Pattern mentionPattern = Pattern.compile("(@[\\w_]+(\\s|$))"); private static final Pattern mentionLongPattern = Pattern.compile("(@[\\w_-]+@[a-z0-9.\\-]+[.][a-z]{2,10})"); @@ -566,8 +565,6 @@ public class Helper { "..--..", ".-.-.-", ".----.",}; public static HashMap sleeps = new HashMap<>(); private static boolean menuAccountsOpened = false; - //Emoji manager - private static Map emoji = new HashMap<>(); public static int liveNotifType(Context context) { SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); @@ -582,50 +579,7 @@ public class Helper { } } - /** - * Converts emojis in input to unicode - * - * @param input String - * @return String - */ - public static String shortnameToUnicode(String input) { - Matcher matcher = SHORTNAME_PATTERN.matcher(input); - - while (matcher.find()) { - String unicode = emoji.get(matcher.group(2)); - if (unicode == null) { - continue; - } - if (Objects.equals(matcher.group(1), " ")) - input = input.replace(": " + matcher.group(2) + ":", unicode); - else - input = input.replace(":" + matcher.group(2) + ":", unicode); - } - return input; - } - public static void fillMapEmoji(Context context) { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(context.getAssets().open("emoji.csv"))); - String line; - while ((line = br.readLine()) != null) { - String[] str = line.split(","); - String unicode = null; - if (str.length == 2) - unicode = new String(new int[]{Integer.parseInt(str[1].replace("0x", "").trim(), 16)}, 0, 1); - else if (str.length == 3) - unicode = new String(new int[]{Integer.parseInt(str[1].replace("0x", "").trim(), 16), Integer.parseInt(str[2].replace("0x", "").trim(), 16)}, 0, 2); - else if (str.length == 4) - unicode = new String(new int[]{Integer.parseInt(str[1].replace("0x", "").trim(), 16), Integer.parseInt(str[2].replace("0x", "").trim(), 16), Integer.parseInt(str[3].replace("0x", "").trim(), 16)}, 0, 3); - else if (str.length == 5) - unicode = new String(new int[]{Integer.parseInt(str[1].replace("0x", "").trim(), 16), Integer.parseInt(str[2].replace("0x", "").trim(), 16), Integer.parseInt(str[3].replace("0x", "").trim(), 16), Integer.parseInt(str[4].replace("0x", "").trim(), 16)}, 0, 4); - if (unicode != null) - emoji.put(str[0], unicode); - } - br.close(); - } catch (IOException ignored) { - } - } /*** * Check if the user is connected to Internet @@ -2052,7 +2006,6 @@ public class Helper { SpannableString spannableString; - fullContent = Helper.shortnameToUnicode(fullContent); SpannableString spannableStringT = new SpannableString(fullContent); Pattern aLink = Pattern.compile("(<\\s?a\\s?href=\"https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[/\\w._-]*)\"\\s?[^.]*<\\s?/\\s?a\\s?>)"); Matcher matcherALink = aLink.matcher(spannableStringT.toString()); diff --git a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java index 19648c6f6..90f98ed04 100644 --- a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java @@ -196,7 +196,7 @@ public class NotificationsSyncJob extends Job { if (notificationUrl == null) { notificationUrl = notification.getAccount().getAvatar(); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getContext().getString(R.string.notif_mention)); + title = String.format("%s %s", notification.getAccount().getDisplay_name(), getContext().getString(R.string.notif_mention)); else title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_mention)); } @@ -209,7 +209,7 @@ public class NotificationsSyncJob extends Job { if (notificationUrl == null) { notificationUrl = notification.getAccount().getAvatar(); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getContext().getString(R.string.notif_reblog)); + title = String.format("%s %s", notification.getAccount().getDisplay_name(), getContext().getString(R.string.notif_reblog)); else title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_reblog)); @@ -223,7 +223,7 @@ public class NotificationsSyncJob extends Job { if (notificationUrl == null) { notificationUrl = notification.getAccount().getAvatar(); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getContext().getString(R.string.notif_favourite)); + title = String.format("%s %s", notification.getAccount().getDisplay_name(), getContext().getString(R.string.notif_favourite)); else title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_favourite)); } @@ -236,7 +236,7 @@ public class NotificationsSyncJob extends Job { if (notificationUrl == null) { notificationUrl = notification.getAccount().getAvatar(); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getContext().getString(R.string.notif_follow_request)); + title = String.format("%s %s", notification.getAccount().getDisplay_name(), getContext().getString(R.string.notif_follow_request)); else title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_follow_request)); targeted_account = notification.getAccount().getId(); @@ -250,7 +250,7 @@ public class NotificationsSyncJob extends Job { if (notificationUrl == null) { notificationUrl = notification.getAccount().getAvatar(); if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getContext().getString(R.string.notif_follow)); + title = String.format("%s %s", notification.getAccount().getDisplay_name(), getContext().getString(R.string.notif_follow)); else title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_follow)); targeted_account = notification.getAccount().getId(); diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java index f16f31ffa..7f5badaef 100644 --- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java +++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java @@ -340,7 +340,7 @@ public class LiveNotificationDelayedService extends Service { notifType = Helper.NotifType.MENTION; if (notif_mention) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_mention)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_mention)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_mention)); if (notification.getStatus() != null) { @@ -364,7 +364,7 @@ public class LiveNotificationDelayedService extends Service { notifType = Helper.NotifType.BOOST; if (notif_share) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_reblog)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_reblog)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_reblog)); } else { @@ -375,7 +375,7 @@ public class LiveNotificationDelayedService extends Service { notifType = Helper.NotifType.FAV; if (notif_add) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_favourite)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_favourite)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_favourite)); } else { @@ -386,7 +386,7 @@ public class LiveNotificationDelayedService extends Service { notifType = Helper.NotifType.FOLLLOW; if (notif_follow) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_follow_request)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_follow_request)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow_request)); targeted_account = notification.getAccount().getId(); @@ -398,7 +398,7 @@ public class LiveNotificationDelayedService extends Service { notifType = Helper.NotifType.FOLLLOW; if (notif_follow) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_follow)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_follow)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow)); targeted_account = notification.getAccount().getId(); diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java index b1c92dee8..2f04c4638 100644 --- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java +++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java @@ -376,7 +376,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece notifType = Helper.NotifType.MENTION; if (notif_mention) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_mention)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_mention)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_mention)); if (notification.getStatus() != null) { @@ -400,7 +400,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece notifType = Helper.NotifType.BOOST; if (notif_share) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_reblog)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_reblog)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_reblog)); } else { @@ -411,7 +411,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece notifType = Helper.NotifType.FAV; if (notif_add) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_favourite)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_favourite)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_favourite)); } else { @@ -422,7 +422,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece notifType = Helper.NotifType.FOLLLOW; if (notif_follow) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_follow_request)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_follow_request)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow_request)); targeted_account = notification.getAccount().getId(); @@ -434,7 +434,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece notifType = Helper.NotifType.FOLLLOW; if (notif_follow) { if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0) - message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name()), getString(R.string.notif_follow)); + message = String.format("%s %s", notification.getAccount().getDisplay_name(), getString(R.string.notif_follow)); else message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow)); targeted_account = notification.getAccount().getId(); -- cgit v1.2.3