Adithya Abraham Philip
3a35df0db7
modify ImportKeysActivity to match new pattern
2015-06-12 22:13:53 +05:30
Adithya Abraham Philip
17aca1c99c
added proxy to all import operations using KeychainService
2015-06-12 22:13:53 +05:30
Adithya Abraham Philip
4e8f58b31d
added OperationResult support to upload to keyserver
2015-06-12 22:13:53 +05:30
Adithya Abraham Philip
53d69548c6
enabled proxy in CertifyKeyFragment
2015-06-12 22:13:53 +05:30
Adithya Abraham Philip
e01415d54b
refactored KeychainService
2015-06-12 22:12:36 +05:30
Adithya Abraham Philip
fb4f3c29d8
orbot dialog fragments added
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
73ae103586
removed NetCipher submodule, copied classes
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
aebafe4f78
fixed Proxy generation, proxy working for for cloud import
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
590748a42b
added placeholder proxy to AddKeyServer
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
4dc20731db
fixed certificate pinning
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
7cd16c479e
fixed prefs
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
e50f9346fd
added proxy support, silent right now
2015-06-12 22:11:19 +05:30
Adithya Abraham Philip
61a9cd8d5e
added ProxyPrefs
2015-06-12 22:05:14 +05:30
Adithya Abraham Philip
af730b1c62
added NetCipher as submodule
2015-06-12 22:05:14 +05:30
Adithya Abraham Philip
021d6ea687
added proxy type
2015-06-12 22:05:14 +05:30
Adithya Abraham Philip
971baf8a17
added class sources
2015-06-12 22:05:14 +05:30
Adithya Abraham Philip
f4a5ab7ad2
added license
2015-06-12 22:05:14 +05:30
Adithya Abraham Philip
90c0ff1887
added proxy/tor preferences
2015-06-12 22:05:14 +05:30
Vincent
655cdfbbee
Merge pull request #1338 from josecastillo/development
...
Improved smart card error handling
2015-06-12 15:00:16 +02:00
Joey Castillo
cda8b63bb4
Replace AssertionErrors with snackbar notifications, fix style issues.
2015-06-11 11:52:09 -04:00
Vincent Breitmoser
5d652e4c41
some bugfixes for new CryptoOperationFragment
2015-06-11 17:10:40 +02:00
Vincent Breitmoser
244f92ed57
Merge remote-tracking branch 'origin/master' into v/eventbus
2015-06-11 15:34:55 +02:00
Dominik Schürmann
98ba424576
Fix coveralls
2015-06-11 13:12:45 +02:00
Dominik Schürmann
7f67658de9
Try coveralls support
2015-06-11 12:58:21 +02:00
Dominik Schürmann
b856d82ae2
Jacoco support for local unit tests
2015-06-11 12:54:15 +02:00
Joey Castillo
14226461c1
Improved smart card error handling
2015-06-10 20:11:55 -04:00
Dominik Schürmann
7a5121894e
Remove unused deps, fix travis
2015-06-11 00:36:05 +02:00
Dominik Schürmann
7c32098211
Add missing WorkaroundBuildConfig
2015-06-11 00:32:18 +02:00
Dominik Schürmann
6749b03d9a
Fix debug/release build separation
2015-06-11 00:31:41 +02:00
Dominik Schürmann
d16b09b2a6
Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds
2015-06-11 00:05:13 +02:00
Dominik Schürmann
05fcbcae7b
Temporary fix for testDebug
2015-06-10 22:35:06 +02:00
Dominik Schürmann
260364e267
Use authority res strings
2015-06-10 20:00:29 +02:00
Dominik Schürmann
aa31abd93f
Allow debug build besides release build
2015-06-10 19:47:29 +02:00
Vincent Breitmoser
61dce088c2
backport CryptoOperationFragment changes without eventbus
2015-06-10 15:45:10 +02:00
Vincent Breitmoser
9b6416943b
Merge remote-tracking branch 'origin/master' into v/eventbus
2015-06-10 14:49:02 +02:00
Dominik Schürmann
e6ea98fabc
Improve FAQ entry for file manager
2015-06-08 22:46:08 +02:00
Dominik Schürmann
47f98493e2
Improve FAQ entry for file manager
2015-06-08 22:44:26 +02:00
Stéphane Lavergne
1045deb0e3
Explicit mention of dependency on 3rd party tool
...
I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files. I'm sure I'm not the only person who could benefit from this reminder. :)
2015-06-08 16:31:48 -04:00
Vincent Breitmoser
0505af7520
select correct item in drawer on backstack change in main activity
2015-06-08 16:18:16 +02:00
Vincent Breitmoser
074b6633b0
eventbus: initial attempt, replace messenger hack with eventbus communication
2015-06-06 23:17:42 +02:00
Adithya Abraham Philip
82f3d70224
prevent null fragments on activity death
2015-06-03 19:01:01 +05:30
Vincent Breitmoser
7cfc0d80d0
Merge branch 'v/sticky-prefs'
2015-06-03 01:23:51 +02:00
Vincent Breitmoser
ecfbc743f3
keep prefernces individual per dialog (affects only compression)
2015-06-03 01:21:06 +02:00
Vincent Breitmoser
bd5a5c0138
Partially revert "switch to native DialogFragment, fix some nullpointers", but keep nullpointer fixes
...
This reverts commit 403f74f558
.
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
2015-06-03 01:16:44 +02:00
Vincent Breitmoser
b3ebb64666
hide invoke nfc button in android < 5
2015-06-03 01:08:32 +02:00
Dominik Schürmann
e2988c2a68
Fix comments in service
2015-06-01 15:52:07 +02:00
Adithya Abraham Philip
ebba24cbd8
corrected indentation
2015-06-01 17:44:44 +05:30
Adithya Abraham Philip
6bc40d12ad
renamed KeychainIntentService to KeychainService
2015-06-01 17:43:00 +05:30
Adithya Abraham Philip
14a08361e5
merged services
2015-06-01 17:41:44 +05:30
Dominik Schürmann
af5fc66229
Merge pull request #1317 from adithyaphilip/master
...
Merge key from Keyserver with that from Keybase instead of replacing
2015-06-01 10:15:46 +02:00