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

Fix Auto/Save activities for GB.

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-07-31 15:48:14 -07:00
parent d991d65225
commit 853e12693d
4 changed files with 124 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
res/layout/auto_initiate_activity.xml
View File

@ -3,29 +3,30 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="10px"> android:layout_marginLeft="16dip"
android:layout_marginRight="16dip">
<TextView android:id="@+id/description_text" <TextView android:id="@+id/description_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="5px" android:layout_marginBottom="5px"
android:text="You have received a message from someone who supports TextSecure encrypted sessions. Would you like to initiate a key exchange so you can communicate securely?"/> android:text="You have received a message from someone who supports TextSecure encrypted sessions. Would you like to initiate a key exchange so you can communicate securely?"/>
<LinearLayout android:layout_width="fill_parent" <LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10px" android:layout_marginTop="10px"
android:orientation="horizontal"> android:orientation="horizontal">
<Button android:id="@+id/initiate_button" <Button android:id="@+id/initiate_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Initiate Exchange" android:text="Initiate Exchange"
android:gravity="center"/> android:gravity="center"/>
<Button android:id="@+id/cancel_button" <Button android:id="@+id/cancel_button"
android:text="Cancel" android:text="Cancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"/> android:gravity="center"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

79
res/layout/save_identity_activity.xml
View File

@ -1,47 +1,46 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Identity Name:" />
<EditText android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/identity_name"
android:padding="16dip"> android:layout_margin="16dip"/>
<TextView android:layout_width="wrap_content" <LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dip" android:orientation="horizontal"
android:text="Identity Name:" /> android:layout_marginBottom="16dip"
android:gravity="right">
<EditText android:layout_width="fill_parent" <TableLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dip" android:stretchColumns="*">
android:id="@+id/identity_name" <TableRow>
android:text="" /> <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"/>
<LinearLayout android:layout_width="fill_parent" <Button android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:text="OK"
android:layout_marginBottom="16dip" android:id="@+id/ok_button"
android:gravity="right"> android:layout_marginRight="16dip"/>
</TableRow>
<TableLayout android:layout_width="wrap_content" </TableLayout>
android:layout_height="wrap_content" </LinearLayout>
android:stretchColumns="*">
<TableRow>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:layout_marginRight="17dip"
android:id="@+id/cancel_button"
android:text="Cancel"/>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:id="@+id/ok_button"
android:text="Ok"/>
</TableRow>
</TableLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>

21
src/org/thoughtcrime/securesms/AutoInitiateActivity.java
View File

@ -16,14 +16,6 @@
*/ */
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.LocalKeyRecord;
import org.thoughtcrime.securesms.database.RemoteKeyRecord;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MemoryCleaner;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
@ -32,6 +24,15 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import com.actionbarsherlock.app.SherlockActivity;
import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.LocalKeyRecord;
import org.thoughtcrime.securesms.database.RemoteKeyRecord;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MemoryCleaner;
/** /**
* Activity which prompts the user to initiate a secure * Activity which prompts the user to initiate a secure
* session. Initiated by whitespace tag detection from * session. Initiated by whitespace tag detection from
@ -40,7 +41,7 @@ import android.widget.Button;
* @author Moxie Marlinspike * @author Moxie Marlinspike
* *
*/ */
public class AutoInitiateActivity extends Activity { public class AutoInitiateActivity extends SherlockActivity {
private long threadId; private long threadId;
private Recipient recipient; private Recipient recipient;
@ -94,7 +95,7 @@ public class AutoInitiateActivity extends Activity {
} }
public static boolean isValidAutoInitiateSituation(Context context, MasterSecret masterSecret, public static boolean isValidAutoInitiateSituation(Context context, MasterSecret masterSecret,
Recipient recipient, String message, long threadId) Recipient recipient, String message, long threadId)
{ {
return return
isMessageTagged(message) && isMessageTagged(message) &&

18
src/org/thoughtcrime/securesms/SaveIdentityActivity.java
View File

@ -16,13 +16,6 @@
*/ */
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import org.thoughtcrime.securesms.crypto.IdentityKey;
import org.thoughtcrime.securesms.crypto.InvalidKeyException;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.util.MemoryCleaner;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
@ -32,13 +25,21 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import com.actionbarsherlock.app.SherlockActivity;
import org.thoughtcrime.securesms.crypto.IdentityKey;
import org.thoughtcrime.securesms.crypto.InvalidKeyException;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.util.MemoryCleaner;
/** /**
* Activity that provides interface for users to save * Activity that provides interface for users to save
* identity keys they receive. * identity keys they receive.
* *
* @author Moxie Marlinspike * @author Moxie Marlinspike
*/ */
public class SaveIdentityActivity extends Activity { public class SaveIdentityActivity extends SherlockActivity {
private MasterSecret masterSecret; private MasterSecret masterSecret;
private IdentityKey identityKey; private IdentityKey identityKey;
@ -56,6 +57,7 @@ public class SaveIdentityActivity extends Activity {
initializeListeners(); initializeListeners();
} }
@Override
protected void onDestroy() { protected void onDestroy() {
MemoryCleaner.clean(masterSecret); MemoryCleaner.clean(masterSecret);
super.onDestroy(); super.onDestroy();