open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
adapter Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
dialog Work on subkeys adapter 2014-07-08 03:34:27 +02:00
widget Edit key: adding user ids 2014-07-02 15:10:50 +02:00
CertifyKeyActivity.java new edit key: diff for existing user ids 2014-06-22 18:12:04 +02:00
DecryptActivity.java Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
DecryptFileFragment.java Added button_rounded style 2014-06-28 21:12:56 +02:00
DecryptFragment.java Converted all other buttons 2014-06-30 19:09:13 +02:00
DecryptMessageFragment.java Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
DrawerActivity.java Added unlock icon, fixed drawer items, switched to icons from resource in drawer 2014-06-27 21:03:19 +02:00
EditKeyActivity.java Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
EditKeyActivityOld.java SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00
EditKeyFragment.java Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
EncryptActivity.java Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
EncryptActivityInterface.java
EncryptAsymmetricFragment.java Fixed, issue #702 2014-06-30 19:13:09 +02:00
EncryptFileFragment.java Updated file_dialog to use the new buttons 2014-06-29 13:21:33 +02:00
EncryptMessageFragment.java Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
EncryptSymmetricFragment.java
HelpAboutFragment.java Add applications section to help 2014-05-07 18:31:31 +02:00
HelpActivity.java Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
HelpHtmlFragment.java Add applications section to help 2014-05-07 18:31:31 +02:00
ImportKeysActivity.java work on edit key 2014-06-30 22:01:17 +02:00
ImportKeysFileFragment.java Fix qr code finally 2014-06-20 23:01:35 +02:00
ImportKeysKeybaseFragment.java New callback model for ImportKeysActivity 2014-06-19 00:38:36 +02:00
ImportKeysListFragment.java code cleanup and plurals in import log entries 2014-06-28 19:15:28 +02:00
ImportKeysQrCodeFragment.java Fix qr code finally 2014-06-20 23:01:35 +02:00
ImportKeysServerFragment.java Fix qr code finally 2014-06-20 23:01:35 +02:00
KeyListActivity.java SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00
KeyListFragment.java Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
LoaderFragment.java Edit key: adding user ids 2014-07-02 15:10:50 +02:00
LogDisplayActivity.java Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
LogDisplayFragment.java Prefer composition to inheritance is the mantra these das 2014-07-06 15:23:39 +01:00
PreferencesActivity.java Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
PreferencesKeyServerActivity.java Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
SelectPublicKeyActivity.java
SelectPublicKeyFragment.java Rename mCurQuery to mQuery for consistency 2014-05-16 11:38:43 +02:00
SelectSecretKeyActivity.java split up filterSign and filterCertify in SelectSecretKeyFragment 2014-04-20 19:38:42 +02:00
SelectSecretKeyFragment.java use long rather than String to build uris by key 2014-05-21 21:26:35 +02:00
SelectSecretKeyLayoutFragment.java Added new button style and converted account_settings and the select_secret_key_layout to use it 2014-06-29 13:59:51 +02:00
UploadKeyActivity.java Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
ViewCertActivity.java Fixed Bootstrap resource 2014-06-30 21:32:40 +02:00
ViewKeyActivity.java work on edit key 2014-06-30 22:01:17 +02:00
ViewKeyCertsFragment.java neatness refactoring 2014-06-04 20:27:25 +02:00
ViewKeyKeysFragment.java fix nullpointer, cleanup 2014-07-02 16:47:12 +02:00
ViewKeyMainFragment.java Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
ViewKeyShareFragment.java Fix for #687 2014-06-24 20:15:48 +02:00
WizardActivity.java SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00