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

Remove encrypted SMS transport, simplify transport options.

Browse Source 
Closes #2647

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-03-12 17:53:38 -07:00
parent 2011391e65
commit a4e18c515c
57 changed files with 541 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
+5 -1
View File
@@ -97,7 +97,11 @@ public class ContactsDatabase {
}
public Cursor query(String filter, boolean pushOnly) {
final boolean includeAndroidContacts = !pushOnly && TextSecurePreferences.isDirectSmsAllowed(context);
// FIXME: This doesn't make sense to me. You pass in pushOnly, but then
// conditionally check to see whether other contacts should be included
// in the query method itself? I don't think this method should have any
// understanding of that stuff.
final boolean includeAndroidContacts = !pushOnly && TextSecurePreferences.isSmsEnabled(context);
final Cursor localCursor = queryLocalDb(filter);
final Cursor androidCursor;
final MatrixCursor newNumberCursor;