TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-23 00:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for dialogs on GB.

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-07-31 14:18:14 -07:00
parent edb286a44d
commit ef0a86398a
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@ -33,13 +33,13 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".PassphraseCreateActivity" <activity android:name=".PassphraseCreateActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="Create Passphrase" android:label="Create Passphrase"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".PassphrasePromptActivity" <activity android:name=".PassphrasePromptActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="Enter Passphrase" android:label="Enter Passphrase"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
@ -50,17 +50,17 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".AutoInitiateActivity" <activity android:name=".AutoInitiateActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="TextSecure Messaging Detected" android:label="TextSecure Messaging Detected"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".ViewIdentityActivity" <activity android:name=".ViewIdentityActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="Public Identity Key" android:label="Public Identity Key"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".PassphraseChangeActivity" <activity android:name=".PassphraseChangeActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="Change Passphrase" android:label="Change Passphrase"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
@ -74,7 +74,7 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".SaveIdentityActivity" <activity android:name=".SaveIdentityActivity"
android:theme="@style/Theme.Sherlock.Dialog" android:theme="@style/Theme.Sherlock.Light.Dialog"
android:label="Save Identity" android:label="Save Identity"
android:windowSoftInputMode="stateVisible" android:windowSoftInputMode="stateVisible"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>

13
src/org/thoughtcrime/securesms/PassphraseActivity.java
View File

@ -16,23 +16,24 @@
*/ */
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.MemoryCleaner;
import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.os.IBinder; import android.os.IBinder;
import com.actionbarsherlock.app.SherlockActivity;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.MemoryCleaner;
/** /**
* Base Activity for changing/prompting local encryption passphrase. * Base Activity for changing/prompting local encryption passphrase.
* *
* @author Moxie Marlinspike * @author Moxie Marlinspike
*/ */
public abstract class PassphraseActivity extends Activity { public abstract class PassphraseActivity extends SherlockActivity {
private KeyCachingService keyCachingService; private KeyCachingService keyCachingService;
private MasterSecret masterSecret; private MasterSecret masterSecret;

10
src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@ -16,11 +16,6 @@
*/ */
package org.thoughtcrime.securesms; package org.thoughtcrime.securesms;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.util.MemoryCleaner;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -28,6 +23,11 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.util.MemoryCleaner;
/** /**
* Activity that prompts for a users's passphrase. * Activity that prompts for a users's passphrase.
* *