Commit Graph

18 Commits

Author SHA1 Message Date
Dominik Schürmann
4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Vincent Breitmoser
9a1ce093bf Merge remote-tracking branch 'origin/master'
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
2014-03-13 13:40:47 +01:00
Dominik Schürmann
217f4a1cef Merge pull request #396 from bhargavgolla/Lint-error-fix
Lint error fix after testing
2014-03-12 22:28:25 +01:00
Vincent Breitmoser
69f5bf6b57 Merge branch 'unified-keylist'
Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
2014-03-12 18:05:28 +01:00
uberspot
43a20ad1da Add export... button and functionality in multi-select 2014-03-11 03:53:00 +02:00
Bhargav Golla
b90e680ff9 Lint changes after testing 2014-03-10 14:59:15 -04:00
Dominik Schürmann
d91e2673d7 Revert "Lint changes"
This reverts commit e00436b409.
2014-03-10 18:23:47 +01:00
Dominik Schürmann
ef8eb3f8b5 Merge pull request #381 from bhargavgolla/Lint-error-fix
Lint changes #223
2014-03-10 18:11:37 +01:00
Bhargav Golla
e00436b409 Lint changes
Deleting lint-report gen files

Adding lint output files to gitignore
2014-03-10 12:42:00 -04:00
Vincent Breitmoser
16116ba725 ditch old key list activities 2014-03-08 13:42:50 +01:00
Nikhil Peter Raj
b29c430959 Fix for #347 2014-03-08 15:28:46 +05:30
uberspot
1cf912de2b Multiselect: Create 'select all' in public and secret keylist 2014-03-06 20:32:27 +02:00
uberspot
ccbb6f95f4 add lock icon for 'Encrypt to..' multiselect option 2014-03-06 15:27:48 +02:00
Vincent Breitmoser
4851f7f8fc copy public keylist as stub for unified keylist 2014-03-06 01:32:18 +01:00
Miroojin Bakshi
53f6189301 Implement search for KeyListPublicFragment 2014-03-06 02:24:13 +05:30
Dominik Schürmann
d75ea3f9e5 Certify not sign a key, added as button, does not belong to menu 2014-02-04 14:20:49 +01:00
Dominik Schürmann
ef1401fc0d Resolve crashes on Android 2.3 due to ActionBarCompat conversion 2014-02-02 14:30:40 +01:00
Dominik Schürmann
cb3ca37db9 New Gradle project structure 2014-01-27 14:18:25 +01:00