moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-19 05:42:17 -05:00
Code Issues Releases Wiki Activity
1,754 Commits 12 Branches 24 Tags 116 MiB
e10b24e2ea
Commit Graph

1754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thialfihar
a3a5085afb Spacing corrections 2014-04-02 13:37:12 +02:00
Dominik Schürmann
269f7feb89 Update from transifex 2014-04-02 11:48:05 +02:00
Dominik Schürmann
64358bb3f8 Merge pull request #502 from thi/conform-to-style-guide 
Conform to style guide, #466
 2014-04-02 11:26:46 +02:00
Thialfihar
22fe3832ba Suppress checkstyle for some files 2014-04-02 10:51:02 +02:00
Thialfihar
592ab31d86 Add missing and curly brackets and fix others 
Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
 2014-04-02 10:51:02 +02:00
Thialfihar
82e5d14fb1 Rearrange too long lines 2014-04-02 10:51:02 +02:00
Thialfihar
d5983b324f Adjust variable/member naming to conform to style guide 
In some cases change member accessibility, so the naming matches.
Also, some key words were reordered to comply with JLS suggestions.
 2014-04-02 10:51:02 +02:00
Thialfihar
dd4a1e3f52 Trivial spacing changes to conform to style guide 2014-04-02 10:51:02 +02:00
Thialfihar
8e503bd263 Adjust copyright headers 2014-04-02 10:51:02 +02:00
Thialfihar
e92658f44d Adjust import order 2014-04-02 10:51:02 +02:00
Ashley Hughes
5583fd513e always ask 2014-04-02 01:28:53 +01:00
Ashley Hughes
9764d3fcb9 confirm that empty IDs are really wanted 2014-04-02 01:26:51 +01:00
Ashley Hughes
a38d22757c new ID sigs already added, so do save them 2014-04-02 00:08:36 +01:00
Ashley Hughes
6d4a09f989 allow blank IDs, allow adding new IDs and let them be master 2014-04-02 00:00:24 +01:00
Ashley Hughes
2ad616ed3f pass through info that keys are new without relying on new keys orginally being empty 2014-04-01 23:37:13 +01:00
Ashley Hughes
abfe416503 sort out saving empty string IDs 2014-04-01 23:02:35 +01:00
Dominik Schürmann
d8001f9bbd Menu cleanup 2014-04-01 19:31:57 +02:00
Dominik Schürmann
c414dd2fe9 Dont show encrypted data before decryption from clipboard 2014-04-01 19:00:14 +02:00
Dominik Schürmann
07fdd6363f Change path to OpenKeychain 2014-04-01 18:49:19 +02:00
Dominik Schürmann
d0947e8377 Only allow private keys associated to accounts of an app 2014-04-01 18:44:36 +02:00
Dominik Schürmann
2c5991b199 Add API image 2014-04-01 17:19:51 +02:00
Dominik Schürmann
2f9cb69a1e Cleanup 2014-04-01 17:13:53 +02:00
Dominik Schürmann
ecca54d4d5 Automatically select newly created key in api accounts 2014-04-01 17:08:56 +02:00
Dominik Schürmann
ddfb7e10e8 Fully qualified imports 2014-04-01 16:39:18 +02:00
Dominik Schürmann
acc2e208cf Remove DECRYPT_ASSUME_SYMMETRIC 2014-04-01 16:18:16 +02:00
Dominik Schürmann
53605855ee Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 16:15:55 +02:00
Dominik Schürmann
7000ab37fd default to allow symmetric decryption 2014-04-01 16:15:50 +02:00
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