TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-16 09:41:26 +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

49
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>

81
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="*"> </LinearLayout>
<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>

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

@ -1,6 +1,6 @@
/** /**
* Copyright (C) 2011 Whisper Systems * Copyright (C) 2011 Whisper Systems
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -10,20 +10,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
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,28 +24,37 @@ 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
* the remote endpoint. * the remote endpoint.
* *
* @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;
private MasterSecret masterSecret; private MasterSecret masterSecret;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
setContentView(R.layout.auto_initiate_activity); setContentView(R.layout.auto_initiate_activity);
initializeResources(); initializeResources();
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
MemoryCleaner.clean(masterSecret); MemoryCleaner.clean(masterSecret);
@ -64,22 +65,22 @@ public class AutoInitiateActivity extends Activity {
this.threadId = this.getIntent().getLongExtra("threadId", -1); this.threadId = this.getIntent().getLongExtra("threadId", -1);
this.recipient = (Recipient)this.getIntent().getParcelableExtra("recipient"); this.recipient = (Recipient)this.getIntent().getParcelableExtra("recipient");
this.masterSecret = (MasterSecret)this.getIntent().getParcelableExtra("masterSecret"); this.masterSecret = (MasterSecret)this.getIntent().getParcelableExtra("masterSecret");
((Button)findViewById(R.id.initiate_button)).setOnClickListener(new OkListener()); ((Button)findViewById(R.id.initiate_button)).setOnClickListener(new OkListener());
((Button)findViewById(R.id.cancel_button)).setOnClickListener(new CancelListener()); ((Button)findViewById(R.id.cancel_button)).setOnClickListener(new CancelListener());
} }
private void initiateKeyExchange() { private void initiateKeyExchange() {
KeyExchangeInitiator.initiate(this, masterSecret, recipient, true); KeyExchangeInitiator.initiate(this, masterSecret, recipient, true);
finish(); finish();
} }
private class OkListener implements View.OnClickListener { private class OkListener implements View.OnClickListener {
public void onClick(View v) { public void onClick(View v) {
initiateKeyExchange(); initiateKeyExchange();
} }
} }
private class CancelListener implements View.OnClickListener { private class CancelListener implements View.OnClickListener {
public void onClick(View v) { public void onClick(View v) {
Log.w("AutoInitiateActivity", "Exempting threadID: " + threadId); Log.w("AutoInitiateActivity", "Exempting threadID: " + threadId);
@ -87,16 +88,16 @@ public class AutoInitiateActivity extends Activity {
AutoInitiateActivity.this.finish(); AutoInitiateActivity.this.finish();
} }
} }
public static void exemptThread(Context context, long threadId) { public static void exemptThread(Context context, long threadId) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
sp.edit().putBoolean("pref_thread_auto_init_exempt_" + threadId, true).commit(); sp.edit().putBoolean("pref_thread_auto_init_exempt_" + threadId, true).commit();
} }
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) &&
isThreadQualified(context, threadId) && isThreadQualified(context, threadId) &&
isExchangeQualified(context, masterSecret, recipient); isExchangeQualified(context, masterSecret, recipient);
@ -110,11 +111,11 @@ public class AutoInitiateActivity extends Activity {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
return !sp.getBoolean("pref_thread_auto_init_exempt_" + threadId, false); return !sp.getBoolean("pref_thread_auto_init_exempt_" + threadId, false);
} }
private static boolean isExchangeQualified(Context context, MasterSecret masterSecret, Recipient recipient) { private static boolean isExchangeQualified(Context context, MasterSecret masterSecret, Recipient recipient) {
return return
(new RemoteKeyRecord(context,recipient).getCurrentRemoteKey() == null) && (new RemoteKeyRecord(context,recipient).getCurrentRemoteKey() == null) &&
(new LocalKeyRecord(context, masterSecret, recipient).getCurrentKeyPair() == null); (new LocalKeyRecord(context, masterSecret, recipient).getCurrentKeyPair() == null);
} }
} }

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

@ -1,6 +1,6 @@
/** /**
* Copyright (C) 2011 Whisper Systems * Copyright (C) 2011 Whisper Systems
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -10,19 +10,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
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,35 +25,44 @@ 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;
private EditText identityName; private EditText identityName;
private Button okButton; private Button okButton;
private Button cancelButton; private Button cancelButton;
@Override @Override
public void onCreate(Bundle bundle) { public void onCreate(Bundle bundle) {
super.onCreate(bundle); super.onCreate(bundle);
setContentView(R.layout.save_identity_activity); setContentView(R.layout.save_identity_activity);
initializeResources(); initializeResources();
initializeListeners(); initializeListeners();
} }
@Override
protected void onDestroy() { protected void onDestroy() {
MemoryCleaner.clean(masterSecret); MemoryCleaner.clean(masterSecret);
super.onDestroy(); super.onDestroy();
} }
private void initializeResources() { private void initializeResources() {
String nameSuggestion = getIntent().getStringExtra("name_suggestion"); String nameSuggestion = getIntent().getStringExtra("name_suggestion");
@ -69,31 +71,31 @@ public class SaveIdentityActivity extends Activity {
this.identityName = (EditText)findViewById(R.id.identity_name); this.identityName = (EditText)findViewById(R.id.identity_name);
this.okButton = (Button)findViewById(R.id.ok_button); this.okButton = (Button)findViewById(R.id.ok_button);
this.cancelButton = (Button)findViewById(R.id.cancel_button); this.cancelButton = (Button)findViewById(R.id.cancel_button);
if ((nameSuggestion != null) && (nameSuggestion.trim().length() > 0)) { if ((nameSuggestion != null) && (nameSuggestion.trim().length() > 0)) {
this.identityName.setText(nameSuggestion); this.identityName.setText(nameSuggestion);
} }
} }
private void initializeListeners() { private void initializeListeners() {
this.okButton.setOnClickListener(new OkListener()); this.okButton.setOnClickListener(new OkListener());
this.cancelButton.setOnClickListener(new CancelListener()); this.cancelButton.setOnClickListener(new CancelListener());
} }
private class OkListener implements View.OnClickListener { private class OkListener implements View.OnClickListener {
public void onClick(View v) { public void onClick(View v) {
if (identityName.getText() == null || identityName.getText().toString().trim().length() == 0) { if (identityName.getText() == null || identityName.getText().toString().trim().length() == 0) {
Toast.makeText(SaveIdentityActivity.this, "You must specify a name for this identity!", Toast.LENGTH_LONG).show(); Toast.makeText(SaveIdentityActivity.this, "You must specify a name for this identity!", Toast.LENGTH_LONG).show();
return; return;
} }
try { try {
DatabaseFactory.getIdentityDatabase(SaveIdentityActivity.this).saveIdentity(masterSecret, identityKey, identityName.getText().toString()); DatabaseFactory.getIdentityDatabase(SaveIdentityActivity.this).saveIdentity(masterSecret, identityKey, identityName.getText().toString());
} catch (InvalidKeyException e) { } catch (InvalidKeyException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(SaveIdentityActivity.this); AlertDialog.Builder builder = new AlertDialog.Builder(SaveIdentityActivity.this);
builder.setTitle("Identity Name Exists!"); builder.setTitle("Identity Name Exists!");
builder.setMessage("An identity key with the specified name already exists."); builder.setMessage("An identity key with the specified name already exists.");
builder.setPositiveButton("Manage Identities", new DialogInterface.OnClickListener() { builder.setPositiveButton("Manage Identities", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(SaveIdentityActivity.this, ReviewIdentitiesActivity.class); Intent intent = new Intent(SaveIdentityActivity.this, ReviewIdentitiesActivity.class);
intent.putExtra("master_secret", masterSecret); intent.putExtra("master_secret", masterSecret);
@ -104,15 +106,15 @@ public class SaveIdentityActivity extends Activity {
builder.show(); builder.show();
return; return;
} }
finish(); finish();
} }
} }
private class CancelListener implements View.OnClickListener { private class CancelListener implements View.OnClickListener {
public void onClick(View v) { public void onClick(View v) {
finish(); finish();
} }
} }
} }