moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Merge pull request #60 from bcbarnes-gmx/Issue43

Browse Source 
Change key bit length control into a dropdown
This commit is contained in:
Dominik Schürmann 2013-07-22 10:46:38 -07:00
commit cb2d2ba0c2
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenPGP-Keychain/res/layout/create_key.xml
View File

@ -58,14 +58,12 @@
android:padding="4dp" android:padding="4dp"
android:text="@string/label_keySize" /> android:text="@string/label_keySize" />
<EditText <Spinner
android:id="@+id/create_key_size" android:id="@+id/create_key_size"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right" android:gravity="right"
android:numeric="integer" android:padding="4dp" />
android:padding="4dp"
android:text="@string/default_key_bit_size" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>

7
OpenPGP-Keychain/res/values/arrays.xml
View File

@ -43,5 +43,10 @@
<item>14400</item> <item>14400</item>
<item>28800</item> <item>28800</item>
</string-array> </string-array>
<string-array name="key_size_spinner_values">
<item>@string/key_size_512</item>
<item>@string/key_size_1024</item>
<item>@string/key_size_2048</item>
<item>@string/key_size_4096</item>
</string-array>
</resources> </resources>

7
OpenPGP-Keychain/res/values/strings.xml
View File

@ -324,11 +324,16 @@
<string name="filterInfo">Filter: \"%s\"</string> <string name="filterInfo">Filter: \"%s\"</string>
<string name="shareKeyringWith">Share keyring with…</string> <string name="shareKeyringWith">Share keyring with…</string>
<!-- key bit length selections -->
<string name="key_size_512">512</string>
<string name="key_size_1024">1024</string>
<string name="key_size_2048">2048</string>
<string name="key_size_4096">4096</string>
<!-- misc --> <!-- misc -->
<string name="fast">fast</string> <string name="fast">fast</string>
<string name="slow">slow</string> <string name="slow">slow</string>
<string name="very_slow">very slow</string> <string name="very_slow">very slow</string>
<string name="default_key_bit_size">2048</string>
<!-- APG 2.0 --> <!-- APG 2.0 -->

26
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
View File

@ -43,6 +43,8 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
@ -186,14 +188,32 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
} }
} }
final EditText keySize = (EditText) view.findViewById(R.id.create_key_size); final Spinner keySize = (Spinner) view.findViewById(R.id.create_key_size);
ArrayAdapter<CharSequence> keySizeAdapter = ArrayAdapter.createFromResource(getContext(), R.array.key_size_spinner_values, android.R.layout.simple_spinner_item);
keySizeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
keySize.setAdapter(keySizeAdapter);
keySize.setSelection(2); // Default to 2048 for the key length
dialog.setPositiveButton(android.R.string.ok, dialog.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface di, int id) { public void onClick(DialogInterface di, int id) {
di.dismiss(); di.dismiss();
try { try {
mNewKeySize = Integer.parseInt("" + keySize.getText()); int nKeyIndex = keySize.getSelectedItemPosition();
switch(nKeyIndex)
{
case 0:
mNewKeySize = 512;
break;
case 1:
mNewKeySize = 1024;
break;
case 2:
mNewKeySize = 2048;
break;
case 3:
mNewKeySize = 4096;
break;
}
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
mNewKeySize = 0; mNewKeySize = 0;
} }