refactor: moving recentEmojis preference to AccountLocalPreferences

Also fixes the compilation problems related to both

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -136,9 +136,6 @@ public static void load(){
 
  // MOSHIDON
  uniformNotificationIcon=prefs.getBoolean("uniformNotificationIcon", false);
- showInteractionCounts=prefs.getBoolean("showInteractionCounts", false);
- alwaysExpandContentWarnings=prefs.getBoolean("alwaysExpandContentWarnings", false);
- disableMarquee=prefs.getBoolean("disableMarquee", false);
  showDividers =prefs.getBoolean("showDividers", false);
  relocatePublishButton=prefs.getBoolean("relocatePublishButton", true);
  compactReblogReplyLine=prefs.getBoolean("compactReblogReplyLine", true);
@@ -150,18 +147,7 @@ public static void load(){
  swapBookmarkWithBoostAction=prefs.getBoolean("swapBookmarkWithBoostAction", false);
  loadRemoteAccountFollowers=prefs.getBoolean("loadRemoteAccountFollowers", true);
  mentionRebloggerAutomatically=prefs.getBoolean("mentionRebloggerAutomatically", false);
- publishButtonText=prefs.getString("publishButtonText", "");
  theme=ThemePreference.values()[prefs.getInt("theme", 0)];
- recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
- recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
- publishButtonText=prefs.getString("publishButtonText", "");
- pinnedTimelines=fromJson(prefs.getString("pinnedTimelines", null), pinnedTimelinesType, new HashMap<>());
- accountsWithLocalOnlySupport=prefs.getStringSet("accountsWithLocalOnlySupport", new HashSet<>());
- accountsInGlitchMode=prefs.getStringSet("accountsInGlitchMode", new HashSet<>());
- replyVisibility=prefs.getString("replyVisibility", null);
- accountsWithContentTypesEnabled=prefs.getStringSet("accountsWithContentTypesEnabled", new HashSet<>());
- accountsDefaultContentTypes=fromJson(prefs.getString("accountsDefaultContentTypes", null), accountsDefaultContentTypesType, new HashMap<>());
-
 
 
  if (prefs.contains("prefixRepliesWithRe")) {
@@ -227,16 +213,6 @@ public static void save(){
  .putBoolean("overlayMedia", overlayMedia)
 
  // MOSHIDON
- .putString("recentLanguages", gson.toJson(recentLanguages))
- .putString("pinnedTimelines", gson.toJson(pinnedTimelines))
- .putString("recentEmojis", gson.toJson(recentEmojis))
- .putStringSet("accountsWithLocalOnlySupport", accountsWithLocalOnlySupport)
- .putStringSet("accountsInGlitchMode", accountsInGlitchMode)
- .putString("replyVisibility", replyVisibility)
- .putStringSet("accountsWithContentTypesEnabled", accountsWithContentTypesEnabled)
- .putString("accountsDefaultContentTypes", gson.toJson(accountsDefaultContentTypes))
- .putString("publishButtonText", publishButtonText)
- .putBoolean("bottomEncoding", bottomEncoding)
  .putBoolean("defaultToUnlistedReplies", defaultToUnlistedReplies)
  .putBoolean("doubleTapToSwipe", doubleTapToSwipe)
  .putBoolean("compactReblogReplyLine", compactReblogReplyLine)

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java

@@ -9,11 +9,14 @@
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.model.ContentType;
+import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class AccountLocalPreferences{
  private final SharedPreferences prefs;
@@ -44,6 +47,10 @@ public class AccountLocalPreferences{
  private final static Type recentLanguagesType = new TypeToken<ArrayList<String>>() {}.getType();
  private final static Type timelinesType = new TypeToken<ArrayList<TimelineDefinition>>() {}.getType();
 
+ // MOSHIDON
+ private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
+ public Map<String, Integer> recentEmojis;
+
  public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
  this.prefs=prefs;
  showInteractionCounts=prefs.getBoolean("interactionCounts", false);
@@ -67,6 +74,9 @@ public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
  keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
  emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
  showEmojiReactionsInLists=prefs.getBoolean("showEmojiReactionsInLists", false);
+
+ // MOSHIDON
+ recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
  }
 
  public long getNotificationsPauseEndTime(){
@@ -100,6 +110,9 @@ public void save(){
  .putBoolean("keepOnlyLatestNotification", keepOnlyLatestNotification)
  .putBoolean("emojiReactionsEnabled", emojiReactionsEnabled)
  .putBoolean("showEmojiReactionsInLists", showEmojiReactionsInLists)
+
+ // MOSHIDON
+ .putString("recentEmojis", gson.toJson(recentEmojis))
  .apply();
  }
 }

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -312,7 +312,7 @@ public void onDetach(){
  @Override
  public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
  creatingView=true;
- emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain);
+ emojiKeyboard=new CustomEmojiPopupKeyboard(getActivity(), customEmojis, instanceDomain, getAccountID());
  emojiKeyboard.setListener(new CustomEmojiPopupKeyboard.Listener(){
  @Override
  public void onEmojiSelected(Emoji emoji){