cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve crashes on Android 2.3 due to ActionBarCompat conversion

Browse Source
This commit is contained in:
Dominik Schürmann
2014-02-02 14:30:40 +01:00
parent 6eaf45940e
commit ef1401fc0d
11 changed files with 209 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@@ -55,6 +55,8 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.support.v4.view.MenuCompat;
import android.support.v4.view.MenuItemCompat;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@@ -127,12 +129,12 @@ public class DecryptActivity extends DrawerActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (mDecryptEnabled) { if (mDecryptEnabled) {
menu.add(1, Id.menu.option.decrypt, 0, mDecryptString).setShowAsAction( MenuItem item = menu.add(1, Id.menu.option.decrypt, 0, mDecryptString);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mReplyEnabled) { if (mReplyEnabled) {
menu.add(1, Id.menu.option.reply, 1, mReplyString).setShowAsAction( MenuItem item = menu.add(1, Id.menu.option.reply, 1, mReplyString);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} }
return true; return true;
@@ -281,7 +283,7 @@ public class DecryptActivity extends DrawerActivity {
mReplyEnabled = false; mReplyEnabled = false;
// build new actionbar // build new actionbar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
if (mReturnResult) { if (mReturnResult) {
mSourcePrevious.setClickable(false); mSourcePrevious.setClickable(false);
@@ -372,7 +374,7 @@ public class DecryptActivity extends DrawerActivity {
mDecryptString = getString(R.string.btn_verify); mDecryptString = getString(R.string.btn_verify);
// build new action bar // build new action bar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
} else { } else {
Log.d(Constants.TAG, "Nothing matched!"); Log.d(Constants.TAG, "Nothing matched!");
} }
@@ -421,7 +423,7 @@ public class DecryptActivity extends DrawerActivity {
mDecryptString = getString(R.string.btn_decrypt); mDecryptString = getString(R.string.btn_decrypt);
// build new action bar // build new action bar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
break; break;
} }
@@ -430,7 +432,7 @@ public class DecryptActivity extends DrawerActivity {
mDecryptString = getString(R.string.btn_decrypt); mDecryptString = getString(R.string.btn_decrypt);
// build new action bar // build new action bar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
break; break;
} }
@@ -723,7 +725,7 @@ public class DecryptActivity extends DrawerActivity {
mReplyEnabled = false; mReplyEnabled = false;
// build new action bar // build new action bar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
Toast.makeText(DecryptActivity.this, R.string.decryption_successful, Toast.makeText(DecryptActivity.this, R.string.decryption_successful,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
@@ -744,7 +746,7 @@ public class DecryptActivity extends DrawerActivity {
mReplyEnabled = false; mReplyEnabled = false;
// build new action bar // build new action bar
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
break; break;
case Id.target.file: case Id.target.file:

21
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
View File

@@ -51,6 +51,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.support.v4.view.MenuItemCompat;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@@ -131,18 +132,16 @@ public class EncryptActivity extends DrawerActivity {
/** /**
* ActionBar menu is created based on class variables to change it at runtime * ActionBar menu is created based on class variables to change it at runtime
*
*/ */
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
if (mEncryptToClipboardEnabled) { if (mEncryptToClipboardEnabled) {
menu.add(1, Id.menu.option.encrypt_to_clipboard, 0, mEncryptToClipboardString) MenuItem item = menu.add(1, Id.menu.option.encrypt_to_clipboard, 0, mEncryptToClipboardString);
.setShowAsAction( MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mEncryptEnabled) { if (mEncryptEnabled) {
menu.add(1, Id.menu.option.encrypt, 1, mEncryptString).setShowAsAction( MenuItem item = menu.add(1, Id.menu.option.encrypt, 1, mEncryptString);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
} }
return true; return true;
@@ -388,7 +387,7 @@ public class EncryptActivity extends DrawerActivity {
} }
// build new action bar based on these class variables // build new action bar based on these class variables
invalidateOptionsMenu(); supportInvalidateOptionsMenu();
} }
/** /**
@@ -718,7 +717,9 @@ public class EncryptActivity extends DrawerActivity {
} }
} }
}; }
;
}; };
// Create a new Messenger for the communication back // Create a new Messenger for the communication back
@@ -844,7 +845,7 @@ public class EncryptActivity extends DrawerActivity {
}); });
mFileCompression = (Spinner) findViewById(R.id.fileCompression); mFileCompression = (Spinner) findViewById(R.id.fileCompression);
Choice[] choices = new Choice[] { Choice[] choices = new Choice[]{
new Choice(Id.choice.compression.none, getString(R.string.choice_none) + " (" new Choice(Id.choice.compression.none, getString(R.string.choice_none) + " ("
+ getString(R.string.compression_fast) + ")"), + getString(R.string.compression_fast) + ")"),
new Choice(Id.choice.compression.zip, "ZIP (" new Choice(Id.choice.compression.zip, "ZIP ("
@@ -852,7 +853,7 @@ public class EncryptActivity extends DrawerActivity {
new Choice(Id.choice.compression.zlib, "ZLIB (" new Choice(Id.choice.compression.zlib, "ZLIB ("
+ getString(R.string.compression_fast) + ")"), + getString(R.string.compression_fast) + ")"),
new Choice(Id.choice.compression.bzip2, "BZIP2 (" new Choice(Id.choice.compression.bzip2, "BZIP2 ("
+ getString(R.string.compression_very_slow) + ")"), }; + getString(R.string.compression_very_slow) + ")"),};
ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(this, ArrayAdapter<Choice> adapter = new ArrayAdapter<Choice>(this,
android.R.layout.simple_spinner_item, choices); android.R.layout.simple_spinner_item, choices);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

4
OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml
View File

@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="16dp" android:paddingLeft="16dp"
android:layout_marginRight="16dp" android:paddingRight="16dp"
android:orientation="vertical" > android:orientation="vertical" >
<fragment <fragment

16
OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml
View File

@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent" android:layout_width="fill_parent"

11
OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml
View File

@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_api_settings_revoke" android:id="@+id/menu_api_settings_revoke"
android:showAsAction="never" android:title="@string/api_settings_revoke"
android:title="@string/api_settings_revoke"/> app:showAsAction="never" />
<item <item
android:id="@+id/menu_api_settings_cancel" android:id="@+id/menu_api_settings_cancel"
android:showAsAction="never" android:title="@string/api_settings_cancel"
android:title="@string/api_settings_cancel"/> app:showAsAction="never" />
</menu> </menu>

15
OpenPGP-Keychain/src/main/res/menu/key_edit.xml
View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_key_edit_export_file" android:id="@+id/menu_key_edit_export_file"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_export_key"/> android:title="@string/menu_export_key" />
<item <item
android:id="@+id/menu_key_edit_delete" android:id="@+id/menu_key_edit_delete"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_delete_key"/> android:title="@string/menu_delete_key" />
<item <item
android:id="@+id/menu_key_edit_cancel" android:id="@+id/menu_key_edit_cancel"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_key_edit_cancel"/> android:title="@string/menu_key_edit_cancel" />
</menu> </menu>

11
OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_key_list_public_import" android:id="@+id/menu_key_list_public_import"
android:showAsAction="always|withText" app:showAsAction="always|withText"
android:icon="@drawable/ic_action_add_person" android:icon="@drawable/ic_action_add_person"
android:title="@string/menu_import"/> android:title="@string/menu_import" />
<item <item
android:id="@+id/menu_key_list_public_export" android:id="@+id/menu_key_list_public_export"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_export_keys"/> android:title="@string/menu_export_keys" />
</menu> </menu>

6
OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:id="@+id/menu_key_list_public_multi_encrypt" android:id="@+id/menu_key_list_public_multi_encrypt"
android:title="@string/menu_encrypt_to"/> android:title="@string/menu_encrypt_to" />
<item <item
android:id="@+id/menu_key_list_public_multi_delete" android:id="@+id/menu_key_list_public_multi_delete"
android:icon="@drawable/ic_action_discard" android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key"/> android:title="@string/menu_delete_key" />
</menu> </menu>

19
OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
View File

@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_key_list_secret_create" android:id="@+id/menu_key_list_secret_create"
android:showAsAction="always|withText" app:showAsAction="always|withText"
android:title="@string/menu_create_key"/> android:title="@string/menu_create_key" />
<item <item
android:id="@+id/menu_key_list_secret_create_expert" android:id="@+id/menu_key_list_secret_create_expert"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_create_key_expert"/> android:title="@string/menu_create_key_expert" />
<item <item
android:id="@+id/menu_key_list_secret_import" android:id="@+id/menu_key_list_secret_import"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_import"/> android:title="@string/menu_import" />
<item <item
android:id="@+id/menu_key_list_secret_export" android:id="@+id/menu_key_list_secret_export"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_export_keys"/> android:title="@string/menu_export_keys" />
</menu> </menu>

4
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:id="@+id/menu_key_list_public_multi_delete" android:id="@+id/menu_key_list_public_multi_delete"
android:icon="@drawable/ic_action_discard" android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key"/> android:title="@string/menu_delete_key" />
</menu> </menu>

55
OpenPGP-Keychain/src/main/res/menu/key_view.xml
View File

@@ -1,48 +1,49 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_key_view_share" android:id="@+id/menu_key_view_share"
android:icon="@drawable/ic_action_share" android:icon="@drawable/ic_action_share"
android:showAsAction="always" app:showAsAction="always"
android:title="@string/menu_share"> android:title="@string/menu_share">
<menu> <menu>
<item <item
android:id="@+id/menu_key_view_share_fingerprint_title" android:id="@+id/menu_key_view_share_fingerprint_title"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_title_fingerprint"> android:title="@string/menu_share_title_fingerprint">
<menu> <menu>
<item <item
android:id="@+id/menu_key_view_share_default_fingerprint" android:id="@+id/menu_key_view_share_default_fingerprint"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_default_fingerprint"/> android:title="@string/menu_share_default_fingerprint" />
<item <item
android:id="@+id/menu_key_view_share_qr_code_fingerprint" android:id="@+id/menu_key_view_share_qr_code_fingerprint"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_qr_code_fingerprint"/> android:title="@string/menu_share_qr_code_fingerprint" />
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/menu_key_view_share_title" android:id="@+id/menu_key_view_share_title"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_title"> android:title="@string/menu_share_title">
<menu> <menu>
<item <item
android:id="@+id/menu_key_view_share_default" android:id="@+id/menu_key_view_share_default"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_default"/> android:title="@string/menu_share_default" />
<item <item
android:id="@+id/menu_key_view_share_qr_code" android:id="@+id/menu_key_view_share_qr_code"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_qr_code"/> android:title="@string/menu_share_qr_code" />
<item <item
android:id="@+id/menu_key_view_share_nfc" android:id="@+id/menu_key_view_share_nfc"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_share_nfc"/> android:title="@string/menu_share_nfc" />
<item <item
android:id="@+id/menu_key_view_share_clipboard" android:id="@+id/menu_key_view_share_clipboard"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_copy_to_clipboard"/> android:title="@string/menu_copy_to_clipboard" />
</menu> </menu>
</item> </item>
</menu> </menu>
@@ -50,30 +51,30 @@
<item <item
android:id="@+id/menu_key_keyserver" android:id="@+id/menu_key_keyserver"
android:icon="@drawable/ic_action_import_export" android:icon="@drawable/ic_action_import_export"
android:showAsAction="always" app:showAsAction="always"
android:title="@string/menu_share"> android:title="@string/menu_share">
<menu> <menu>
<item <item
android:id="@+id/menu_key_view_update" android:id="@+id/menu_key_view_update"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_update_key"/> android:title="@string/menu_update_key" />
<item <item
android:id="@+id/menu_key_view_export_keyserver" android:id="@+id/menu_key_view_export_keyserver"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_export_key_to_server"/> android:title="@string/menu_export_key_to_server" />
</menu> </menu>
</item> </item>
<item <item
android:id="@+id/menu_key_view_sign" android:id="@+id/menu_key_view_sign"
android:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:title="@string/menu_sign_key"/> android:title="@string/menu_sign_key" />
<item <item
android:id="@+id/menu_key_view_export_file" android:id="@+id/menu_key_view_export_file"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_export_key"/> android:title="@string/menu_export_key" />
<item <item
android:id="@+id/menu_key_view_delete" android:id="@+id/menu_key_view_delete"
android:showAsAction="never" app:showAsAction="never"
android:title="@string/menu_delete_key"/> android:title="@string/menu_delete_key" />
</menu> </menu>