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

Split into library project and add shared preferences layer of indirection.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-07-09 18:26:18 -07:00
parent 2539723410
commit 21eee19380
22 changed files with 277 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/contacts/ContactIdentityManagerGingerbread.java
View File

@@ -12,6 +12,7 @@ import android.provider.ContactsContract.RawContacts;
import android.telephony.TelephonyManager;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.util.ArrayList;
import java.util.List;
@@ -24,14 +25,10 @@ class ContactIdentityManagerGingerbread extends ContactIdentityManager {
@Override
public Uri getSelfIdentityUri() {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
String contactUriString = preferences.getString(ApplicationPreferencesActivity.IDENTITY_PREF, null);
String contactUriString = TextSecurePreferences.getIdentityContactUri(context);
if (hasLocalNumber()) {
return getContactUriForNumber(getLocalNumber());
} else if (contactUriString != null) {
return Uri.parse(contactUriString);
}
if (hasLocalNumber()) return getContactUriForNumber(getLocalNumber());
else if (contactUriString != null) return Uri.parse(contactUriString);
return null;
}