TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-25 22:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix GB StringSet compat issue.

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty 2015-09-03 14:04:47 -07:00
parent 17cde0cbb7
commit 6d0e783236
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.util; package org.thoughtcrime.securesms.util;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings; import android.provider.Settings;
@ -8,6 +9,8 @@ import android.support.annotation.ArrayRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
import com.h6ah4i.android.compat.content.SharedPreferenceCompat;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.preferences.NotificationPrivacyPreference; import org.thoughtcrime.securesms.preferences.NotificationPrivacyPreference;
@ -15,7 +18,6 @@ import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
public class TextSecurePreferences { public class TextSecurePreferences {
@ -501,6 +503,13 @@ public class TextSecurePreferences {
} }
private static Set<String> getStringSetPreference(Context context, String key, Set<String> defaultValues) { private static Set<String> getStringSetPreference(Context context, String key, Set<String> defaultValues) {
return PreferenceManager.getDefaultSharedPreferences(context).getStringSet(key, defaultValues); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
if (prefs.contains(key)) {
return SharedPreferenceCompat.getStringSet(PreferenceManager.getDefaultSharedPreferences(context),
key,
Collections.<String>emptySet());
} else {
return defaultValues;
}
} }
} }