TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix emoji backwards compatibility recents crash

Browse Source 
The old emoji drawer stored emoji with a .png suffix. Replace it during
list deserialization.
This commit is contained in:
Veeti Paananen 2014-07-31 02:49:36 +03:00
parent 26d58047b5
commit 40ce0cebe0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/thoughtcrime/securesms/util/Emoji.java
View File

@ -20,6 +20,11 @@ import android.util.SparseArray;
import android.view.View; import android.view.View;
import com.google.thoughtcrimegson.Gson; import com.google.thoughtcrimegson.Gson;
import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext;
import com.google.thoughtcrimegson.JsonDeserializer;
import com.google.thoughtcrimegson.JsonElement;
import com.google.thoughtcrimegson.JsonParseException;
import com.google.thoughtcrimegson.reflect.TypeToken; import com.google.thoughtcrimegson.reflect.TypeToken;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -305,8 +310,16 @@ public class Emoji {
String serialized = prefs.getString(EMOJI_LRU_PREFERENCE, "[]"); String serialized = prefs.getString(EMOJI_LRU_PREFERENCE, "[]");
Type type = new TypeToken<LinkedHashSet<String>>() { Type type = new TypeToken<LinkedHashSet<String>>() {
}.getType(); }.getType();
JsonDeserializer<String> backwardsDeserializer = new JsonDeserializer<String>() {
@Override
public String deserialize(JsonElement jsonElement, Type type,
JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
return jsonElement.getAsString().replace(".png", "");
}
};
recentlyUsed = new Gson().fromJson(serialized, type); recentlyUsed = new GsonBuilder().registerTypeAdapter(String.class, backwardsDeserializer)
.create().fromJson(serialized, type);
} }
public static String[] getRecentlyUsed(Context context) { public static String[] getRecentlyUsed(Context context) {