moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-18 21:32:16 -05:00
Code Issues Releases Wiki Activity
2,377 Commits 12 Branches 24 Tags 116 MiB
527c3e93f8
Commit Graph

2377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
247ad6207a Merge pull request #501 from Valodim/master 
factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
 2014-04-01 16:13:41 +02:00
Vincent Breitmoser
62388e3fdb test: add junit+robolectric to buildfiles and stub test file 2014-04-01 16:12:57 +02:00
Vincent Breitmoser
6f36b72eee PgpKeyOperation: factor out all android dependencies 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-04-01 16:12:57 +02:00
Dominik Schürmann
ebb7f55921 Fix symmetric decryption 2014-04-01 16:08:40 +02:00
Dominik Schürmann
fadc08480f Fix pre-selection for encrypt 2014-04-01 15:40:07 +02:00
Dominik Schürmann
19e5a3815a language 2014-04-01 15:36:27 +02:00
Dominik Schürmann
ba81869038 More layout fixes 2014-04-01 15:33:56 +02:00
Dominik Schürmann
ab8031fb52 More layout fixes 2014-04-01 15:32:14 +02:00
Dominik Schürmann
6e705e5519 Language clarifications 2014-04-01 15:19:12 +02:00
Dominik Schürmann
ef562b5e20 Fix layouts 2014-04-01 15:04:54 +02:00
Dominik Schürmann
866d2d28cc Simplify encrypt and sign backend 2014-04-01 14:25:37 +02:00
Dominik Schürmann
c859bbb6da Fix symmetric encryption and cleanup 2014-04-01 14:10:32 +02:00
Dominik Schürmann
b020f950e1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 13:31:57 +02:00
Dominik Schürmann
6a617e0bf8 Small layout fix (more to come) 2014-04-01 13:31:49 +02:00
Dominik Schürmann
4c3506f4b1 Experimental work on a fragment-based encrypt activity 2014-04-01 13:25:44 +02:00
Ashley Hughes
9283205ea8 don't disable save button, show message if nothing needs to be done 2014-04-01 00:37:18 +01:00
Ashley Hughes
5bc902dbb1 create three keys by default 2014-03-31 23:23:51 +01:00
Ashley Hughes
47b23a90d5 change how new default keys are passed back, fix showing their usage flags 2014-03-31 22:42:24 +01:00
Dominik Schürmann
8f2abf36f8 Layouts for new encrypt design 2014-03-31 20:04:05 +02:00
Dominik Schürmann
bb2fb786a8 Include signature result in fragments 2014-03-30 21:33:00 +02:00
Dominik Schürmann
55a2cbe9c3 Decrypt mostly works again 2014-03-30 20:53:16 +02:00
Dominik Schürmann
ccce28acdb compiles again 2014-03-30 19:35:35 +02:00
Dominik Schürmann
2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Dominik Schürmann
4cec2194e0 Experiments with fragments in decrypt activity 2014-03-30 19:32:04 +02:00
Dominik Schürmann
224e8a7554 Remove cancel from app menu 2014-03-30 19:29:07 +02:00
Dominik Schürmann
583467356c Revert "Remove cancel from app menu" 
This reverts commit 3c0b97f280.
 2014-03-30 19:28:35 +02:00
Dominik Schürmann
3c0b97f280 Remove cancel from app menu 2014-03-30 19:26:41 +02:00
Dominik Schürmann
7b53150ad5 Remove FLAG_ONE_SHOT from most PIs 2014-03-30 19:25:39 +02:00
Dominik Schürmann
fc4f9beb6a Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-30 19:18:41 +02:00
Dominik Schürmann
e3a7d372a3 Increase API_VERSION to 3 2014-03-30 19:18:18 +02:00
Dominik Schürmann
b648d87d76 Parcelable versioning 2014-03-30 19:13:10 +02:00
Dominik Schürmann
6b5d60e1f4 Merge pull request #491 from openpgp-keychain/edit-key 
Edit key changes
 2014-03-30 18:04:43 +02:00
Ashley Hughes
be007ecc56 style changes 2014-03-30 16:22:13 +01:00
Dominik Schürmann
b2342744b5 Actually use fixBadCharactersForGmail 2014-03-30 14:02:09 +02:00
Ashley Hughes
95eb33b2ed use save icon, not tick 2014-03-29 15:33:03 +00:00
Ashley Hughes
556d6ff226 revert mistake 2014-03-29 15:19:38 +00:00
Ashley Hughes
e1d07214df merge master 2014-03-29 13:21:39 +00:00
Dominik Schürmann
c8defe2e6d Merge pull request #489 from mb-14/clipboard_fp 
Enable importing of fingerprints from clipboard.
 2014-03-27 21:47:33 +01:00
Miroojin Bakshi
d5e3958565 Enable importing of fingerprints from clipboard. 2014-03-28 00:34:24 +05:30
Ashley Hughes
7a2d880c4d all editing cases I can think of now work 2014-03-27 15:00:35 +00:00
Ashley Hughes
56447ad0b5 fix for editing master keys and IDs, case of change primary ID and modify master key props fails 2014-03-27 14:48:27 +00:00
Ashley Hughes
140646fa12 pass through original primary ID 2014-03-27 13:35:03 +00:00
Dominik Schürmann
68668fd444 Version 2.4 2014-03-26 22:56:51 +01:00
Dominik Schürmann
619c079f00 Sync changelog and about with transifex 2014-03-26 22:55:33 +01:00
Dominik Schürmann
a589b6e7fe Changelog for 2.4 2014-03-26 22:48:23 +01:00
Dominik Schürmann
8e9ceffae3 Changelog for 2.4 2014-03-26 22:45:35 +01:00
Dominik Schürmann
19bbaecf32 Update from transifex 2014-03-26 22:20:23 +01:00
Dominik Schürmann
cc8fd35137 Show divider only when used 2014-03-26 18:34:48 +01:00
Dominik Schürmann
ac134790a0 Text for creation of new api accounts 2014-03-26 18:23:48 +01:00
Dominik Schürmann
399106015e Rename layouts for remote activity 2014-03-26 18:18:00 +01:00