Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate profile key into database.

Browse Source
This commit is contained in:
Alan Evans
2020-02-10 10:06:12 -05:00
committed by Greyson Parrelli
parent b92c389a5b
commit f10d1eac61
11 changed files with 87 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/util/Base64.java
View File

@@ -16,4 +16,12 @@ public final class Base64 {
public static @NonNull String encodeBytes(@NonNull byte[] source) {
return org.whispersystems.util.Base64.encodeBytes(source);
}
public static @NonNull byte[] decodeOrThrow(@NonNull String s) {
try {
return org.whispersystems.util.Base64.decode(s);
} catch (IOException e) {
throw new AssertionError();
}
}
}

9
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@@ -123,7 +123,6 @@ public class TextSecurePreferences {
private static final String MULTI_DEVICE_PROVISIONED_PREF = "pref_multi_device";
public static final String DIRECT_CAPTURE_CAMERA_ID = "pref_direct_capture_camera_id";
private static final String ALWAYS_RELAY_CALLS_PREF = "pref_turn_only";
private static final String PROFILE_KEY_PREF = "pref_profile_key";
private static final String PROFILE_NAME_PREF = "pref_profile_name";
private static final String PROFILE_AVATAR_ID_PREF = "pref_profile_avatar_id";
public static final String READ_RECEIPTS_PREF = "pref_read_receipts";
@@ -435,14 +434,6 @@ public class TextSecurePreferences {
setBooleanPreference(context, GIF_GRID_LAYOUT, isGrid);
}
public static @Nullable String getProfileKey(Context context) {
return getStringPreference(context, PROFILE_KEY_PREF, null);
}
public static void setProfileKey(Context context, String key) {
setStringPreference(context, PROFILE_KEY_PREF, key);
}
public static void setProfileName(Context context, ProfileName name) {
setStringPreference(context, PROFILE_NAME_PREF, name.serialize());
}