aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Update spongycastle to 1.53Dominik Schürmann2015-12-223-4/+6
|
* Backup: Move FAQ button to last screen and simplify codeDominik Schürmann2015-12-224-124/+113
|
* Cleanup in HelpActivityDominik Schürmann2015-12-221-4/+0
|
* Update FAQ from websiteDominik Schürmann2015-12-221-57/+90
|
* Improve how_to_importDominik Schürmann2015-12-221-1/+1
|
* Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into ↵Dominik Schürmann2015-12-226-8/+86
|\ | | | | | | TedaLIEz-master
| * Issue #1595aLIEzTed2015-12-226-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | link to faq link to app Issue #1595 Issue#1595 Revert commits Sorry for overhead annotation
* | Default for theme settingDominik Schürmann2015-12-221-2/+3
| |
* | Add hint to encrypt fieldDominik Schürmann2015-12-223-5/+2
| |
* | Follow notification style guidelines, dismiss permission notification on clickDominik Schürmann2015-12-223-64/+9
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-12-217-45/+78
|\ \
| * | fixed key update preference not turning offAdithya Abraham Philip2015-12-214-45/+59
| | |
| * | api: add micalg result extra to detached signature api callVincent Breitmoser2015-12-173-0/+19
| | |
* | | Make ContactHelper less staticDominik Schürmann2015-12-219-166/+152
|/ /
* | linked: correctly show errors in linked id wizardVincent Breitmoser2015-12-141-7/+1
| |
* | some work on benchmark operation (affects only debug build)Vincent Breitmoser2015-12-131-1/+4
| |
* | encryptkeycompletionview: don't use prefixVincent Breitmoser2015-12-131-16/+4
| |
* | Nicer RESULT_INSECURE fallback for old API versionsDominik Schürmann2015-12-101-9/+2
| |
* | Merge pull request #1610 from open-keychain/facebookDominik Schürmann2015-12-1026-374/+554
|\ \ | |/ |/| Basic Facebook Support
| * added Facebook links support, reworked PreferencesAdithya Abraham Philip2015-12-0626-374/+554
| |
* | Issue#1605 solvedTedaLIEz2015-12-091-1/+6
|/
* Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_IDfiaxh2015-12-032-5/+4
|
* encryptkeycompletionview: don't initialize to null on attachVincent Breitmoser2015-11-302-12/+3
|
* move custm api permission methods into helper class (composition over ↵Vincent Breitmoser2015-11-272-41/+49
| | | | inheritance)
* Pull from transifexDominik Schürmann2015-11-2423-0/+92
|
* 3.7 changelogDominik Schürmann2015-11-231-0/+4
|
* Pull from transifexDominik Schürmann2015-11-2348-421/+3509
|
* externalize notification helper for iconDominik Schürmann2015-11-231-0/+50
|
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-2310-64/+38
|
* re-enable contact sync by defaultDominik Schürmann2015-11-232-7/+3
|
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-236-175/+5
| | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10.
* No need to delete by raw contact idDominik Schürmann2015-11-231-30/+8
|
* Disable contact sync by default on Android >= 6Dominik Schürmann2015-11-233-35/+36
|
* Add first time wizard for sync settingsDominik Schürmann2015-11-236-5/+175
|
* API version 10Dominik Schürmann2015-11-231-1/+1
|
* Fix potential NPEDominik Schürmann2015-11-231-2/+2
|
* Show notification when READ_CONTACTS permission is denied in sync service, ↵Dominik Schürmann2015-11-2316-47/+148
| | | | hide linked contact card if permission is denied
* Request contact permission in settings for contact linkingDominik Schürmann2015-11-232-10/+69
|
* Request READ_EXTERNAL_STORAGE permission on key importDominik Schürmann2015-11-191-11/+77
|
* FileHelperLollipop: Check by comparing UID instead of checking files read ↵Dominik Schürmann2015-11-191-14/+4
| | | | permissions. This fixes sharing of file uris from sdcard
* Handle denied storage permission, use ContentResolver.SCHEME_FILE constantDominik Schürmann2015-11-195-8/+30
|
* Request READ_EXTERNAL_STORAGE permission for encryption of files (shared by ↵Dominik Schürmann2015-11-192-37/+108
| | | | file managers to OpenKeychain)
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-1918-246/+578
|\
| * Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-166-1/+126
| |\ | | | | | | mouseover hints
| | * Class names and string names are updatedrohands2015-09-226-18/+20
| | |
| | * Updatedrohands2015-09-205-6/+27
| | |
| | * Mousehintsrohands2015-09-204-0/+102
| | |
| * | decryptlist: fix iteratorsVincent Breitmoser2015-11-151-4/+12
| | |
| * | fix delete file securely method and use for delete original fileVincent Breitmoser2015-11-153-70/+58
| | |
| * | add documentation on marker packet skippingVincent2015-11-151-1/+9
| | |