diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index ed93b8a0d..f4e4f58ba 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -30,12 +30,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - - - diff --git a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java deleted file mode 100644 index 656596380..000000000 --- a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.thoughtcrime.securesms.components.identity; - - -import android.content.Context; -import android.content.DialogInterface; -import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.IdentityDatabase; -import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; - -import java.util.List; - -import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK; - -public class UntrustedSendDialog extends AlertDialog.Builder implements DialogInterface.OnClickListener { - - private final List untrustedRecords; - private final ResendListener resendListener; - - public UntrustedSendDialog(@NonNull Context context, - @NonNull String message, - @NonNull List untrustedRecords, - @NonNull ResendListener resendListener) - { - super(context); - this.untrustedRecords = untrustedRecords; - this.resendListener = resendListener; - - setTitle(R.string.UntrustedSendDialog_send_message); - setIconAttribute(R.attr.dialog_alert_icon); - setMessage(message); - setPositiveButton(R.string.UntrustedSendDialog_send, this); - setNegativeButton(android.R.string.cancel, null); - } - - @Override - public void onClick(DialogInterface dialog, int which) { - final IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(getContext()); - - new AsyncTask() { - @Override - protected Void doInBackground(Void... params) { - synchronized (SESSION_LOCK) { - for (IdentityRecord identityRecord : untrustedRecords) { - identityDatabase.setApproval(identityRecord.getAddress(), true); - } - } - - return null; - } - - @Override - protected void onPostExecute(Void result) { - resendListener.onResendMessage(); - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - - public interface ResendListener { - public void onResendMessage(); - } -} diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java deleted file mode 100644 index 753d8df71..000000000 --- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.thoughtcrime.securesms.components.identity; - - -import android.content.Context; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.util.AttributeSet; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.IdentityDatabase; -import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; -import org.thoughtcrime.securesms.util.ViewUtil; - -import java.util.List; - -public class UnverifiedBannerView extends LinearLayout { - - private static final String TAG = UnverifiedBannerView.class.getSimpleName(); - - private View container; - private TextView text; - private ImageView closeButton; - - public UnverifiedBannerView(Context context) { - super(context); - initialize(); - } - - public UnverifiedBannerView(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - initialize(); - } - - @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB) - public UnverifiedBannerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initialize(); - } - - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public UnverifiedBannerView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - initialize(); - } - - private void initialize() { - LayoutInflater.from(getContext()).inflate(R.layout.unverified_banner_view, this, true); - this.container = ViewUtil.findById(this, R.id.container); - this.text = ViewUtil.findById(this, R.id.unverified_text); - this.closeButton = ViewUtil.findById(this, R.id.cancel); - } - - public void display(@NonNull final String text, - @NonNull final List unverifiedIdentities, - @NonNull final ClickListener clickListener, - @NonNull final DismissListener dismissListener) - { - this.text.setText(text); - setVisibility(View.VISIBLE); - - this.container.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - Log.w(TAG, "onClick()"); - clickListener.onClicked(unverifiedIdentities); - } - }); - - this.closeButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - hide(); - dismissListener.onDismissed(unverifiedIdentities); - } - }); - } - - public void hide() { - setVisibility(View.GONE); - } - - public interface DismissListener { - public void onDismissed(List unverifiedIdentities); - } - - public interface ClickListener { - public void onClicked(List unverifiedIdentities); - } - -} diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java deleted file mode 100644 index ed41a723d..000000000 --- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.thoughtcrime.securesms.components.identity; - -import android.content.Context; -import android.content.DialogInterface; -import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.IdentityDatabase; -import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; - -import java.util.List; - -import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK; - -public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogInterface.OnClickListener { - - private final List untrustedRecords; - private final ResendListener resendListener; - - public UnverifiedSendDialog(@NonNull Context context, - @NonNull String message, - @NonNull List untrustedRecords, - @NonNull ResendListener resendListener) - { - super(context); - this.untrustedRecords = untrustedRecords; - this.resendListener = resendListener; - - setTitle(R.string.UnverifiedSendDialog_send_message); - setIconAttribute(R.attr.dialog_alert_icon); - setMessage(message); - setPositiveButton(R.string.UnverifiedSendDialog_send, this); - setNegativeButton(android.R.string.cancel, null); - } - - @Override - public void onClick(DialogInterface dialog, int which) { - final IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(getContext()); - - new AsyncTask() { - @Override - protected Void doInBackground(Void... params) { - synchronized (SESSION_LOCK) { - for (IdentityRecord identityRecord : untrustedRecords) { - identityDatabase.setVerified(identityRecord.getAddress(), - identityRecord.getIdentityKey(), - IdentityDatabase.VerifiedStatus.DEFAULT); - } - } - - return null; - } - - @Override - protected void onPostExecute(Void result) { - resendListener.onResendMessage(); - } - }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - - public interface ResendListener { - public void onResendMessage(); - } -} diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java index 53500d4e3..e85218254 100644 --- a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java +++ b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java @@ -16,21 +16,13 @@ */ package org.thoughtcrime.securesms.database; -import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; -import org.thoughtcrime.securesms.util.Base64; import org.whispersystems.libsignal.IdentityKey; -import org.whispersystems.libsignal.InvalidKeyException; -import org.thoughtcrime.securesms.util.guava.Optional; - -import java.io.IOException; public class IdentityDatabase extends Database { @@ -58,19 +50,6 @@ public class IdentityDatabase extends Database { public enum VerifiedStatus { DEFAULT, VERIFIED, UNVERIFIED; - public int toInt() { - if (this == DEFAULT) return 0; - else if (this == VERIFIED) return 1; - else if (this == UNVERIFIED) return 2; - else throw new AssertionError(); - } - - public static VerifiedStatus forState(int state) { - if (state == 0) return DEFAULT; - else if (state == 1) return VERIFIED; - else if (state == 2) return UNVERIFIED; - else throw new AssertionError("No such state: " + state); - } } IdentityDatabase(Context context, SQLCipherOpenHelper databaseHelper) { @@ -82,83 +61,6 @@ public class IdentityDatabase extends Database { return database.query(TABLE_NAME, null, null, null, null, null, null); } - public @Nullable IdentityReader readerFor(@Nullable Cursor cursor) { - if (cursor == null) return null; - return new IdentityReader(cursor); - } - - public Optional getIdentity(Address address) { - SQLiteDatabase database = databaseHelper.getReadableDatabase(); - Cursor cursor = null; - - try { - cursor = database.query(TABLE_NAME, null, ADDRESS + " = ?", - new String[] {address.serialize()}, null, null, null); - - if (cursor != null && cursor.moveToFirst()) { - return Optional.of(getIdentityRecord(cursor)); - } - } catch (InvalidKeyException | IOException e) { - throw new AssertionError(e); - } finally { - if (cursor != null) cursor.close(); - } - - return Optional.absent(); - } - - public void saveIdentity(Address address, IdentityKey identityKey, VerifiedStatus verifiedStatus, - boolean firstUse, long timestamp, boolean nonBlockingApproval) - { - SQLiteDatabase database = databaseHelper.getWritableDatabase(); - String identityKeyString = Base64.encodeBytes(identityKey.serialize()); - - ContentValues contentValues = new ContentValues(); - contentValues.put(ADDRESS, address.serialize()); - contentValues.put(IDENTITY_KEY, identityKeyString); - contentValues.put(TIMESTAMP, timestamp); - contentValues.put(VERIFIED, verifiedStatus.toInt()); - contentValues.put(NONBLOCKING_APPROVAL, nonBlockingApproval ? 1 : 0); - contentValues.put(FIRST_USE, firstUse ? 1 : 0); - - database.replace(TABLE_NAME, null, contentValues); - } - - public void setApproval(Address address, boolean nonBlockingApproval) { - SQLiteDatabase database = databaseHelper.getWritableDatabase(); - - ContentValues contentValues = new ContentValues(2); - contentValues.put(NONBLOCKING_APPROVAL, nonBlockingApproval); - - database.update(TABLE_NAME, contentValues, ADDRESS + " = ?", new String[] {address.serialize()}); - } - - public void setVerified(Address address, IdentityKey identityKey, VerifiedStatus verifiedStatus) { - SQLiteDatabase database = databaseHelper.getWritableDatabase(); - - ContentValues contentValues = new ContentValues(1); - contentValues.put(VERIFIED, verifiedStatus.toInt()); - - int updated = database.update(TABLE_NAME, contentValues, ADDRESS + " = ? AND " + IDENTITY_KEY + " = ?", - new String[] {address.serialize(), Base64.encodeBytes(identityKey.serialize())}); - - if (updated > 0) { - Optional record = getIdentity(address); - } - } - - private IdentityRecord getIdentityRecord(@NonNull Cursor cursor) throws IOException, InvalidKeyException { - String address = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)); - String serializedIdentity = cursor.getString(cursor.getColumnIndexOrThrow(IDENTITY_KEY)); - long timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(TIMESTAMP)); - int verifiedStatus = cursor.getInt(cursor.getColumnIndexOrThrow(VERIFIED)); - boolean nonblockingApproval = cursor.getInt(cursor.getColumnIndexOrThrow(NONBLOCKING_APPROVAL)) == 1; - boolean firstUse = cursor.getInt(cursor.getColumnIndexOrThrow(FIRST_USE)) == 1; - IdentityKey identity = new IdentityKey(Base64.decode(serializedIdentity), 0); - - return new IdentityRecord(Address.fromSerialized(address), identity, VerifiedStatus.forState(verifiedStatus), firstUse, timestamp, nonblockingApproval); - } - public static class IdentityRecord { private final Address address; @@ -166,7 +68,6 @@ public class IdentityDatabase extends Database { private final VerifiedStatus verifiedStatus; private final boolean firstUse; private final long timestamp; - private final boolean nonblockingApproval; private IdentityRecord(Address address, IdentityKey identitykey, VerifiedStatus verifiedStatus, @@ -177,62 +78,20 @@ public class IdentityDatabase extends Database { this.verifiedStatus = verifiedStatus; this.firstUse = firstUse; this.timestamp = timestamp; - this.nonblockingApproval = nonblockingApproval; } public Address getAddress() { return address; } - public IdentityKey getIdentityKey() { - return identitykey; - } - public long getTimestamp() { return timestamp; } - public VerifiedStatus getVerifiedStatus() { - return verifiedStatus; - } - - public boolean isApprovedNonBlocking() { - return nonblockingApproval; - } - - public boolean isFirstUse() { - return firstUse; - } - @Override public String toString() { return "{address: " + address + ", identityKey: " + identitykey + ", verifiedStatus: " + verifiedStatus + ", firstUse: " + firstUse + "}"; } } - - public class IdentityReader { - private final Cursor cursor; - - IdentityReader(@NonNull Cursor cursor) { - this.cursor = cursor; - } - - public @Nullable IdentityRecord getNext() { - if (cursor.moveToNext()) { - try { - return getIdentityRecord(cursor); - } catch (IOException | InvalidKeyException e) { - throw new AssertionError(e); - } - } - - return null; - } - - public void close() { - cursor.close(); - } - } - }