Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be more lenient around long-int conversion in SignalStore.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-04-29 21:58:37 -04:00
parent c6f4a01001
commit f7763a5b82
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/thoughtcrime/securesms/keyvalue/KeyValueDataSet.java
View File

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.keyvalue;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.util.Util;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -119,12 +121,30 @@ public class KeyValueDataSet implements KeyValueReader {
return types.get(key);
}
private <E> E readValueAsType(@NonNull String key, Class<E> type, boolean nullable) {
private <E> E readValueAsType(@NonNull String key, Class<E> expectedType, boolean nullable) {
Object value = values.get(key);
if ((value == null && nullable) || (value != null && value.getClass() == type)) {
return type.cast(value);
} else {
throw new IllegalArgumentException("Type mismatch!");
if (value == null && nullable) {
return null;
}
if (value == null) {
throw new IllegalArgumentException("Nullability mismatch!");
}
if (value.getClass() == expectedType) {
return expectedType.cast(value);
}
if (expectedType == Integer.class && value instanceof Long) {
long longValue = (long) value;
return expectedType.cast(Util.toIntExact(longValue));
}
if (expectedType == Long.class && value instanceof Integer) {
int intValue = (int) value;
return expectedType.cast((long) intValue);
}
throw new IllegalArgumentException("Type mismatch!");
}
}