aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix comment in nfcGenerateOnCardKeyDominik Schürmann2016-03-081-1/+1
| | | |
| * | | Add nfcGenerateOnCardKey by Joey Castillo before it gets lostDominik Schürmann2016-03-081-0/+42
| | | |
| * | | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain ↵Dominik Schürmann2016-03-074-82/+81
| |\ \ \ | | | | | | | | | | | | | | | into kepuss-okHttpLinkedToken
| | * | | okHttpMichal Kepkowski2016-03-044-82/+81
| | | | |
| * | | | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
| | | | |
| * | | | fix bug from leftover line in openpgpserviceVincent Breitmoser2016-03-071-1/+0
| | | | |
| * | | | Merge pull request #1757 from 007durgesh219/Issue#1752Dominik Schürmann2016-03-061-1/+7
| |\ \ \ \ | | | | | | | | | | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752
| | * | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752Durgesh2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | | | Merge pull request #1747 from runnerway/fix-alreadyaddedDominik Schürmann2016-03-061-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix duplicate file insertion while encrypting
| | * | | | Remove uri from pending even when already addedAndrea Torlaschi2016-03-041-2/+2
| | |/ / /
| * | | | Merge pull request #1750 from 007durgesh219/Issue#1746Dominik Schürmann2016-03-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746
| | * | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746Durgesh2016-03-051-1/+1
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | | Merge pull request #1738 from runnerway/storage-permission-fixDominik Schürmann2016-03-051-1/+8
| |\ \ \ \ | | | | | | | | | | | | Always check read permission
| | * | | | Always check read permissionAndrea Torlaschi2016-03-021-1/+8
| | | | | |
| * | | | | Merge pull request #1751 from runnerway/decrypt-filenameDominik Schürmann2016-03-052-4/+14
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fix wrong behavior of third-party apps while opening files after decryption
| | * | | | Set filename after decryptionAndrea Torlaschi2016-03-051-2/+3
| | | | | |
| | * | | | Extend FileProvider to support name updateAndrea Torlaschi2016-03-051-2/+11
| | | |/ / | | |/| |
| * / | | Update ContactSyncAdapterService.javaAdvaita2016-03-031-0/+7
| |/ / /
| * / / add v11 to supported api versionsVincent Breitmoser2016-03-021-3/+6
| |/ /
| * | handle openpgp4fpr intent filter as import rather than certify (see #1661)Vincent Breitmoser2016-03-021-1/+4
| | |
| * | small nullpointer fixVincent Breitmoser2016-03-021-3/+6
| | |
| * | nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734)Vincent Breitmoser2016-03-021-1/+1
| | |
| * | Fix backup code comparisonAndrea Torlaschi2016-03-021-5/+6
| | |
| * | add some license headersVincent Breitmoser2016-02-243-0/+52
| | |
| * | wipVincent Breitmoser2016-02-241-42/+88
| | |
| * | add ACTION_CHECK_PERMISSION for a simple permission checkVincent Breitmoser2016-02-241-0/+13
| | |
| * | external-provider: add permission check for status queryVincent Breitmoser2016-02-244-7/+54
| | |
| * | external-provider: add (experimental) external providerVincent Breitmoser2016-02-242-0/+266
| | |
| * | split off ApiDataAccessObject from ProviderHelperVincent Breitmoser2016-02-2411-247/+324
| |/
* / Add backup APIDominik Schürmann2016-03-019-27/+213
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-02-237-25/+229
|\
| * Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-237-25/+229
| |\ | | | | | | try to guess if data is text or not
| | * ditch isLikelyText flag, set mimeType to text/plain in that caseVincent Breitmoser2016-02-234-19/+27
| | |
| | * move CharsetVerifier to utils packageVincent Breitmoser2016-02-233-2/+3
| | |
| | * documentation and cleanupVincent Breitmoser2016-02-223-4/+24
| | |
| | * displaytext: add "View Log" option, move "Copy to clipboard" into overflow menuVincent Breitmoser2016-02-222-1/+16
| | |
| | * decrypt: always show "View in OpenKeychain" as intent chooser option iff ↵Vincent Breitmoser2016-02-221-0/+12
| | | | | | | | | | | | isLikelyText
| | * decryptVerify: use CharsetVerifier to guess whether data is binary or notVincent Breitmoser2016-02-221-10/+19
| | |
| | * externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata objectVincent Breitmoser2016-02-223-87/+148
| | |
| | * mime: try to decode with given charset or utf-8 while file is readVincent Breitmoser2016-02-222-6/+84
| | |
* | | Passthrough of data Intent in methods of ApiPendingIntentFactory instead of ↵Dominik Schürmann2016-02-233-50/+58
|/ / | | | | | | constructor
* / Remove AspectRatioImageViewunyoungwax2016-02-231-138/+0
|/
* Extend documentation, proper method naming, use of deprecated method annotationDominik Schürmann2016-02-226-44/+51
|
* Use FLAG_IMMUTABLEDominik Schürmann2016-02-221-6/+22
|
* Move PendingIntent creation into factoryDominik Schürmann2016-02-223-140/+201
|
* Split remote methods from activities for better seperationDominik Schürmann2016-02-227-57/+127
|
* Extract service parts from SecurityTokenOperationActivityDominik Schürmann2016-02-224-23/+62
|
* Use BC provider as default oneDominik Schürmann2016-02-211-3/+7
|
* Split RemoteServiceActivity into multiple activitiesDominik Schürmann2016-02-1511-377/+468
|
* Use non-breaking spaces for backup code MaskedEditTextDominik Schürmann2016-02-101-2/+7
|