From 31d59dddefbea1a764312abc25fae32d80e3e125 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 31 Jul 2012 17:02:50 -0700
Subject: [PATCH] Remove key exchange indicator from list view, spruce up
 create passphrase dialog.

---
 res/layout/conversation_item_received.xml     |   2 +-
 ...ew.xml => conversation_list_item_view.xml} |   7 --
 res/layout/create_passphrase_activity.xml     | 106 ++++++++++--------
 .../securesms/ConversationListItem.java       |  15 +--
 .../securesms/PassphraseCreateActivity.java   |  51 +++++----
 5 files changed, 86 insertions(+), 95 deletions(-)
 rename res/layout/{conversation_header_view.xml => conversation_list_item_view.xml} (92%)

diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index a3bd43ab7d..3ee5a705f7 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -15,7 +15,7 @@
         <view  xmlns:android="http://schemas.android.com/apk/res/android"
                class="org.thoughtcrime.securesms.components.ImageDivet"
                position="right"
-               android:id="@id/contact_photo"
+               android:id="@+id/contact_photo"
                android:layout_alignParentLeft="true"
                android:layout_width="60dp"
                android:layout_height="60dp"
diff --git a/res/layout/conversation_header_view.xml b/res/layout/conversation_list_item_view.xml
similarity index 92%
rename from res/layout/conversation_header_view.xml
rename to res/layout/conversation_list_item_view.xml
index 0238d7bc13..7b33681ea2 100644
--- a/res/layout/conversation_header_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -10,13 +10,6 @@
                        android:layout_centerVertical="true"
                        android:layout_alignParentLeft="true" />
 
-   <ImageView android:id="@+id/key_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_alignParentLeft="true"
-        android:visibility="invisible"
-        android:src="@drawable/key_exchange_indicator" />
-
     <CheckBox android:id="@+id/checkbox"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 73aa88d8eb..4645eb044b 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -5,58 +5,70 @@
             android:layout_height="fill_parent"
             xmlns:android="http://schemas.android.com/apk/res/android">
 
-<LinearLayout android:id="@+id/LinearLayout"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="8px"
-                xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="16dip"
+                  android:paddingRight="16dip"
+                  android:orientation="vertical">
 
-<TextView android:text="Please enter a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase."
-          android:textAppearance="?android:attr/textAppearanceMedium"
-          android:id="@+id/create_pass_label"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_margin="10dip"/>
+        <TextView android:text="Please choose a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase."
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="10dip"
+                  android:layout_marginBottom="10dip"/>
 
-<EditText android:id="@+id/passphrase_edit"
-          android:layout_height="wrap_content"
-          android:layout_width="fill_parent"
-          android:password="true"
-          android:layout_margin="10dip"/>
+        <TextView android:text="Passphrase:"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_margin="5dip"/>
 
-<TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:id="@+id/repeat_label"
-          android:textAppearance="?android:attr/textAppearanceMedium"
-          android:layout_margin="10dip"
-          android:text="Repeat:"></TextView>
+        <EditText android:id="@+id/passphrase_edit"
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:password="true"/>
 
-<EditText
-          android:layout_height="wrap_content"
-          android:layout_width="fill_parent"
-          android:password="true"
-          android:layout_margin="10dip"
-          android:id="@+id/passphrase_edit_repeat"></EditText>
+        <TextView
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:id="@+id/repeat_label"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:layout_marginBottom="5dip"
+                  android:layout_marginTop="10dip"
+                  android:text="Repeat:"/>
 
-<RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:id="@+id/RelativeLayout"
-        >
-<Button android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:id="@+id/cancel_button" android:text="Cancel"
-        android:layout_below="@id/passphrase_edit_repeat"
-        android:layout_alignParentRight="true"></Button>
+        <EditText
+                  android:layout_height="wrap_content"
+                  android:layout_width="fill_parent"
+                  android:password="true"
+                  android:id="@+id/passphrase_edit_repeat"/>
 
-<Button android:layout_below="@id/passphrase_edit_repeat"
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:text="Ok" android:id="@+id/ok_button"
-        android:layout_toLeftOf="@id/cancel_button"></Button>
-        </RelativeLayout>
+        <LinearLayout android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="horizontal"
+                      android:layout_marginBottom="16dip"
+                      android:gravity="right">
 
-</LinearLayout>
+            <TableLayout android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:stretchColumns="*">
+                <TableRow>
+                    <Button android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:text="Cancel"
+                            android:id="@+id/cancel_button"
+                            android:layout_marginRight="15dip"
+                            android:layout_marginLeft="16dip"/>
+
+                    <Button android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="OK"
+                            android:id="@+id/ok_button"
+                            android:layout_marginRight="16dip"/>
+                </TableRow>
+            </TableLayout>
+        </LinearLayout>
+    </LinearLayout>
 </ScrollView>
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 05757b2f4e..4e7e4738fe 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -54,7 +54,6 @@ public class ConversationListItem extends RelativeLayout {
   private TextView          subjectView;
   private TextView          fromView;
   private TextView          dateView;
-  private View              keyIndicator;
   private CheckBox          checkbox;
   private QuickContactBadge contactPhoto;
 
@@ -69,13 +68,12 @@ public class ConversationListItem extends RelativeLayout {
     super(context);
 
     LayoutInflater li = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    li.inflate(R.layout.conversation_header_view, this, true);
+    li.inflate(R.layout.conversation_list_item_view, this, true);
 
     this.selectedThreads = selectedThreads;
     this.subjectView     = (TextView)findViewById(R.id.subject);
     this.fromView        = (TextView)findViewById(R.id.from);
     this.dateView        = (TextView)findViewById(R.id.date);
-    this.keyIndicator    = findViewById(R.id.key_indicator);
     this.contactPhoto    = (QuickContactBadge)findViewById(R.id.contact_photo);
     this.checkbox        = (CheckBox)findViewById(R.id.checkbox);
 
@@ -105,9 +103,6 @@ public class ConversationListItem extends RelativeLayout {
     if (selectedThreads != null)
       this.checkbox.setChecked(selectedThreads.contains(threadId));
 
-    clearIndicators();
-    setIndicators(message.isKeyExchange());
-
     if (!first) {
       if (batchMode) checkbox.setVisibility(View.VISIBLE);
       else           checkbox.setVisibility(View.GONE);
@@ -122,14 +117,6 @@ public class ConversationListItem extends RelativeLayout {
     checkbox.setOnCheckedChangeListener(new CheckedChangedListener());
   }
 
-  private void clearIndicators() {
-    this.keyIndicator.setVisibility(View.INVISIBLE);
-  }
-
-  private void setIndicators(boolean key) {
-    if (key) this.keyIndicator.setVisibility(View.VISIBLE);
-  }
-
   private CharSequence formatFrom(Recipients from, long count, boolean read) {
     SpannableStringBuilder builder = new SpannableStringBuilder(from.toShortString());
 
diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index 13474fadfa..06f93e9ef5 100644
--- a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,31 +10,30 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.view.View;
-import android.view.Window;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
 /**
  * Activity for creating a user's local encryption passphrase.
- * 
+ *
  * @author Moxie Marlinspike
  */
 public class PassphraseCreateActivity extends PassphraseActivity {
@@ -43,32 +42,32 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   private EditText	   passphraseRepeatEdit;
   private Button       okButton;
   private Button       cancelButton;
-	
+
   public PassphraseCreateActivity() {	}
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+
     setContentView(R.layout.create_passphrase_activity);
-		
+
     initializeResources();
   }
-	
+
   private void initializeResources() {
     this.passphraseEdit       = (EditText) findViewById(R.id.passphrase_edit);
     this.passphraseRepeatEdit = (EditText) findViewById(R.id.passphrase_edit_repeat);
     this.okButton             = (Button) findViewById(R.id.ok_button);
     this.cancelButton         = (Button) findViewById(R.id.cancel_button);
-		
+
     this.okButton.setOnClickListener(new OkButtonClickListener());
     this.cancelButton.setOnClickListener(new CancelButtonClickListener());
   }
-	
+
   private void verifyAndSavePassphrases() {
     String passphrase       = this.passphraseEdit.getText().toString();
     String passphraseRepeat = this.passphraseRepeatEdit.getText().toString();
-		
+
     if (!passphrase.equals(passphraseRepeat)) {
       Toast.makeText(getApplicationContext(), "Passphrases Don't Match!", Toast.LENGTH_SHORT).show();
       this.passphraseEdit.setText("");
@@ -80,21 +79,21 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       new AsymmetricSecretGenerator(masterSecret).generate();
     }
   }
-	
+
   private class AsymmetricSecretGenerator extends Handler implements Runnable {
     private ProgressDialog progressDialog;
     private MasterSecret masterSecret;
-		
+
     public AsymmetricSecretGenerator(MasterSecret masterSecret) {
       this.masterSecret = masterSecret;
     }
-		
+
     public void run() {
       MasterSecretUtil.generateAsymmetricMasterSecret(PassphraseCreateActivity.this, masterSecret);
       IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this, masterSecret);
       this.obtainMessage().sendToTarget();
     }
-		
+
     public void generate() {
       progressDialog = new ProgressDialog(PassphraseCreateActivity.this);
       progressDialog.setTitle("Generating KeyPair");
@@ -103,22 +102,22 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       progressDialog.setIndeterminate(true);
       progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
       progressDialog.show();
-      new Thread(this).start();			
+      new Thread(this).start();
     }
-		
+
     @Override
     public void handleMessage(Message message) {
       progressDialog.dismiss();
       setMasterSecret(masterSecret);
     }
   }
-	
+
   private class CancelButtonClickListener implements OnClickListener {
-    public void onClick(View v) {	
+    public void onClick(View v) {
       finish();
     }
   }
-	
+
   private class OkButtonClickListener implements OnClickListener {
     public void onClick(View v) {
       verifyAndSavePassphrases();