keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix passphrase prompt dialog activity.

Browse Source
pull/1/head
Moxie Marlinspike 13 years ago
parent a7cc47d259
commit c7e891eda4
2 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File

8
AndroidManifest.xml
Unescape Escape View File

@ -32,10 +32,16 @@
android:windowSoftInputMode="stateHidden" android:windowSoftInputMode="stateHidden"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".PassphrasePromptActivity"
android:theme="@style/Theme.Sherlock.Dialog"
android:label="Enter Passphrase"
android:launchMode="singleInstance"
android:windowSoftInputMode="stateVisible"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
<activity android:name=".AutoInitiateActivity" android:theme="@android:style/Theme.Dialog" android:label="TextSecure Messaging Detected" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".AutoInitiateActivity" android:theme="@android:style/Theme.Dialog" android:label="TextSecure Messaging Detected" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".ApplicationPreferencesActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".ApplicationPreferencesActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".PassphraseCreateActivity" android:theme="@android:style/Theme.Dialog" android:label="Create Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".PassphraseCreateActivity" android:theme="@android:style/Theme.Dialog" android:label="Create Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".PassphrasePromptActivity" android:theme="@android:style/Theme.Dialog" android:label="Enter Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".PassphraseChangeActivity" android:theme="@android:style/Theme.Dialog" android:label="Change Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".PassphraseChangeActivity" android:theme="@android:style/Theme.Dialog" android:label="Change Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".SendKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Initiate Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".SendKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Initiate Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
<activity android:name=".ReceiveKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Complete Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity> <activity android:name=".ReceiveKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Complete Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>

53
res/layout/prompt_passphrase_activity.xml
Unescape Escape View File

@ -1,48 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout android:id="@+id/RelativeLayout01"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"> android:orientation="vertical">
<!-- <ImageView android:id="@+id/icon"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/key_square"-->
<!-- android:layout_alignParentLeft="true"-->
<!-- android:layout_alignParentTop="true"-->
<!-- android:layout_margin="15dip" />-->
<!-- -->
<!-- <TextView android:layout_width="wrap_content" -->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_toRightOf="@id/icon"-->
<!-- android:layout_alignBaseline="@id/icon" -->
<!-- android:text="Enter Passphrase" -->
<!-- android:textSize="20dip"-->
<!-- android:id="@+id/enter_passphrase_label" />-->
<EditText android:inputType="textPassword" <EditText android:inputType="textPassword"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/passphrase_edit" android:id="@+id/passphrase_edit"
android:password="true" android:password="true"
android:layout_below="@id/icon" android:layout_margin="16dip"/>
android:layout_width="fill_parent"
android:layout_margin="15dip"></EditText>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="16dip"
android:gravity="right">
<TableLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:stretchColumns="*">
<TableRow>
<Button android:layout_height="wrap_content" <Button android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="Cancel" android:text="Cancel"
android:layout_width="70dip"
android:id="@+id/cancel_button" android:id="@+id/cancel_button"
android:layout_marginRight="15dip" android:layout_marginRight="15dip"
android:layout_alignParentRight="true" android:layout_marginLeft="16dip"/>
android:layout_below="@id/passphrase_edit" ></Button>
<Button android:layout_below="@id/passphrase_edit" <Button android:layout_width="wrap_content"
android:layout_width="70dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="OK" android:text="OK"
android:layout_toLeftOf="@id/cancel_button"
android:id="@+id/ok_button" android:id="@+id/ok_button"
android:layout_marginRight="15dip" ></Button> android:layout_marginRight="16dip"/>
</TableRow>
</RelativeLayout> </TableLayout>
</LinearLayout>
</LinearLayout>

Write Preview
Loading…
Cancel
Save