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

Handle SMS fallback preferences correctly, and fix directory sync.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-17 15:31:42 -08:00
parent 94b54a6d63
commit 9bb327db42
16 changed files with 148 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
library/src/org/whispersystems/textsecure/directory/Directory.java
View File

@@ -7,11 +7,9 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.telephony.TelephonyManager;
import android.util.Log;
import org.whispersystems.textsecure.push.ContactNumberDetails;
import org.whispersystems.textsecure.util.DirectoryUtil;
import org.whispersystems.textsecure.push.ContactTokenDetails;
import org.whispersystems.textsecure.util.InvalidNumberException;
import org.whispersystems.textsecure.util.PhoneNumberFormatter;
@@ -19,7 +17,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class Directory {
@@ -66,6 +63,25 @@ public class Directory {
this.databaseHelper = new DatabaseHelper(context, DATABASE_NAME, null, DATABASE_VERSION);
}
public boolean isSmsFallbackSupported(String e164number) {
SQLiteDatabase db = databaseHelper.getReadableDatabase();
Cursor cursor = null;
try {
cursor = db.query(TABLE_NAME, new String[] {SUPPORTS_SMS}, NUMBER + " = ?",
new String[]{e164number}, null, null, null);
if (cursor != null && cursor.moveToFirst()) {
return cursor.getInt(0) == 1;
} else {
return false;
}
} finally {
if (cursor != null)
cursor.close();
}
}
public boolean isActiveNumber(String e164number) throws NotInDirectoryException {
if (e164number == null || e164number.length() == 0) {
return false;
@@ -109,7 +125,7 @@ public class Directory {
}
}
public void setNumber(ContactNumberDetails token, boolean active) {
public void setNumber(ContactTokenDetails token, boolean active) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
ContentValues values = new ContentValues();
values.put(NUMBER, token.getNumber());
@@ -120,13 +136,13 @@ public class Directory {
db.replace(TABLE_NAME, null, values);
}
public void setNumbers(List<ContactNumberDetails> activeTokens, Collection<String> inactiveTokens) {
public void setNumbers(List<ContactTokenDetails> activeTokens, Collection<String> inactiveTokens) {
long timestamp = System.currentTimeMillis();
SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.beginTransaction();
try {
for (ContactNumberDetails token : activeTokens) {
for (ContactTokenDetails token : activeTokens) {
Log.w("Directory", "Adding active token: " + token);
ContentValues values = new ContentValues();
values.put(NUMBER, token.getNumber());

22
library/src/org/whispersystems/textsecure/push/AccountAttributes.java Normal file
View File

@@ -0,0 +1,22 @@
package org.whispersystems.textsecure.push;
public class AccountAttributes {
private String signalingKey;
private boolean supportsSms;
public AccountAttributes(String signalingKey, boolean supportsSms) {
this.signalingKey = signalingKey;
this.supportsSms = supportsSms;
}
public AccountAttributes() {}
public String getSignalingKey() {
return signalingKey;
}
public boolean isSupportsSms() {
return supportsSms;
}
}

31
library/src/org/whispersystems/textsecure/push/ContactDetails.java
View File

@@ -1,31 +0,0 @@
package org.whispersystems.textsecure.push;
import com.google.thoughtcrimegson.Gson;
public abstract class ContactDetails {
private String relay;
private boolean supportsSms;
public ContactDetails() {}
public ContactDetails(String relay) {
this.relay = relay;
}
public String getRelay() {
return relay;
}
public void setRelay(String relay) {
this.relay = relay;
}
public boolean isSupportsSms() {
return supportsSms;
}
public String toString() {
return new Gson().toJson(this);
}
}

42
library/src/org/whispersystems/textsecure/push/ContactNumberDetails.java
View File

@@ -1,42 +0,0 @@
package org.whispersystems.textsecure.push;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class ContactNumberDetails extends ContactDetails {
private static final String TAG = "ContactNumberDetails";
private String number;
public ContactNumberDetails() { super(); }
public ContactNumberDetails(String number) {
super();
this.number = number;
}
public ContactNumberDetails(String number, String relay) {
super(relay);
this.number = number;
}
public String getNumber() {
return number;
}
public static List<ContactNumberDetails> fromContactTokenDetailsList(List<ContactTokenDetails> contactTokenDetails, final Map<String, String> tokenMap) {
if (contactTokenDetails == null || tokenMap == null) return null;
List<ContactNumberDetails> contactNumberDetails = new ArrayList<ContactNumberDetails>(contactTokenDetails.size());
for (ContactTokenDetails tokenDetails : contactTokenDetails) {
if (tokenMap.containsKey(tokenDetails.getToken()))
contactNumberDetails.add(new ContactNumberDetails(tokenMap.get(tokenDetails.getToken()), tokenDetails.getRelay()));
else
Log.w(TAG, "tokenMap was missing a contact.");
}
return contactNumberDetails;
}
}

32
library/src/org/whispersystems/textsecure/push/ContactTokenDetails.java
View File

@@ -2,24 +2,32 @@ package org.whispersystems.textsecure.push;
import com.google.thoughtcrimegson.Gson;
public class ContactTokenDetails extends ContactDetails {
public class ContactTokenDetails {
private String token;
private String relay;
private String number;
private boolean supportsSms;
public ContactTokenDetails() { super(); }
public ContactTokenDetails(String token) {
super();
this.token = token;
}
public ContactTokenDetails(String token, String relay) {
super(relay);
this.token = token;
}
public ContactTokenDetails() {}
public String getToken() {
return token;
}
public String getRelay() {
return relay;
}
public boolean isSupportsSms() {
return supportsSms;
}
public void setNumber(String number) {
this.number = number;
}
public String getNumber() {
return number;
}
}

6
library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
View File

@@ -71,8 +71,10 @@ public class PushServiceSocket {
makeRequest(String.format(path, localNumber), "GET", null);
}
public void verifyAccount(String verificationCode, String signalingKey) throws IOException {
SignalingKey signalingKeyEntity = new SignalingKey(signalingKey);
public void verifyAccount(String verificationCode, String signalingKey, boolean supportsSms)
throws IOException
{
AccountAttributes signalingKeyEntity = new AccountAttributes(signalingKey, supportsSms);
makeRequest(String.format(VERIFY_ACCOUNT_PATH, verificationCode),
"PUT", new Gson().toJson(signalingKeyEntity));
}

16
library/src/org/whispersystems/textsecure/push/SignalingKey.java
View File

@@ -1,16 +0,0 @@
package org.whispersystems.textsecure.push;
public class SignalingKey {
private String signalingKey;
public SignalingKey(String signalingKey) {
this.signalingKey = signalingKey;
}
public SignalingKey() {}
public String getSignalingKey() {
return signalingKey;
}
}