aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Used a constant instead of magic number for colourVictor Hazali2016-04-042-1/+3
| | | | Explicitly stated the blending mode
* Fixes #1298Victor Hazali2016-03-301-0/+2
|
* change sync interval on change in codeAdithya Abraham Philip2016-03-244-12/+63
|
* Merge pull request #1785 from advaita13/wifi-only-fixVincent2016-03-249-22/+119
|\ | | | | Sync only when unmetered internet is available #1670
| * Final commitAdvaita2016-03-239-22/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default
* | Merge pull request #1782 from fiaxh/share_key_mimeDominik Schürmann2016-03-241-1/+1
|\ \ | | | | | | Set MIME application/pgp-keys when sending a key
| * | Set MIME application/pgp-keys when sending a keyfiaxh2016-03-141-1/+1
| |/
* | use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-232-11/+0
| |
* | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-239-157/+75
| |
* | Fix CertifyKeyActivity back button on action bar not working #1758Durgesh2016-03-221-0/+11
| | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | update null-check for duplicates, and add matching indexes to name and email ↵Vincent Breitmoser2016-03-162-7/+13
| | | | | | | | columns
* | small update to duplicate detectionVincent Breitmoser2016-03-151-2/+5
| |
* | Merge pull request #1777 from fjodorver/masterVincent2016-03-151-2/+2
|\ \ | | | | | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider #1745
| * | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email ↵fjodor2016-03-101-2/+2
| | | | | | | | | | | | address instead of user id #1745
* | | fix ridiculous database migration bug introduced by ↵Vincent Breitmoser2016-03-151-9/+7
| |/ |/| | | | | d6e4936fa54dc3577296dbadaeb556178dcad2c3
* | Merge pull request #1780 from AlexFJW/backup-code-selectionDominik Schürmann2016-03-121-0/+25
|\ \ | | | | | | Provisional backup-code text selection fix
| * | Provisional backup-code text selection fixAlex Fong2016-03-121-0/+25
| | | | | | | | | | | | | | | | | | | | | For issue #1779, a provisional fix where selection is still possible, but more difficult. Preventing selection altogether is not possible due to the implementation in the Masked-Edittext dependency. To be updated when Masked-Edittext fixes this bug.
* | | Merge pull request #1763 from fjodorver/masterVincent2016-03-104-15/+38
|\ \ \ | | |/ | |/| WIP: Save split user ids in database #1745
| * | Increased version DB and added a migration path from an old database formatfjodor2016-03-071-2/+5
| | |
| * | Save split user ids in database #1745fjodor2016-03-074-13/+33
| | | | | | | | | | | | Save split user ids in database
* | | service: add opportunistic mode to encryptionVincent Breitmoser2016-03-101-20/+26
| | |
* | | Fix display of keyserver item in dark themefiaxh2016-03-101-3/+4
| |/ |/|
* | Fix NullPointerException in ↵Durgesh2016-03-081-1/+1
| | | | | | | | | | | | ImportKeysListFragment.checkAndRequestReadPermission, #1766 Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
| |
* | Make it a style to reduce code duplicationDominik Schürmann2016-03-086-148/+25
| |
* | Add more responsive text sizesDominik Schürmann2016-03-082-1/+74
| |
* | Using new size qualifiersDominik Schürmann2016-03-084-3/+74
| |
* | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-083-11/+2
| | | | | | | | | | | | | | This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
* | Fix code style and documentation in BaseSecurityTokenNfcActivityDominik Schürmann2016-03-082-40/+45
| |
* | Fix documentation of nfcGenerateOnCardKeyDominik Schürmann2016-03-081-3/+1
| |
* | 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
| | |/ / | |/| |
* | | | Merge pull request #1743 from advaita13/masterDominik Schürmann2016-03-031-0/+7
|\ \ \ \ | |/ / / |/| | | Contact Synchronisation Notification
| * | | Update ContactSyncAdapterService.javaAdvaita2016-03-031-0/+7
| | |/ | |/|
* | | Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 10:23:34 +0000