aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Corrected warning messageVictor Hazali2016-04-011-1/+1
| | | | | | |
| | | * | | | Corrected capitalisation of subkeyVictor Hazali2016-03-301-2/+2
| | | | | | |
| | | * | | | Refactored switch statements to use constantsVictor Hazali2016-03-301-5/+9
| | | | | | |
| | | * | | | Extracted methodVictor Hazali2016-03-301-16/+20
| | | | | | |
| | | * | | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into ↵Victor Hazali2016-03-302-1/+19
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | warn-when-stripping-master-key
| | | | * | | Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-022-1/+19
| | | | | | |
| | * | | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-0414-485/+362
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | Refer to issue #1600 Limit create key options
| | | * | | | Redesigned subkey creation dialog and changed default key type created to ↵Alex Fong2016-04-0114-485/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
| | * | | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-318-23/+45
| | | | | | |
| | * | | | | Display Key moved to FragmentDurgesh2016-03-295-173/+233
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| | * | | | 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-233-13/+2
| | | | | | | |
| | * | | | | | 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
| | * | | | | Version 3.9.4Dominik Schürmann2016-03-151-2/+2
| | | | | | |
| | * | | | | 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
| | * | | | | Version 3.9.3Dominik Schürmann2016-03-151-2/+2
| | | |/ / / | | |/| | |
| | * | | | 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.
| * | | | | | OKhttp url factoryMichal Kepkowski2016-04-062-8/+26
| | | | | | |
| * | | | | | okhttp3Michal Kepkowski2016-03-1411-113/+131
| |/ / / / /
| * | | | | 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
| | | | |
| * | | | Update okhttp2, tokenautomcomplete, zxingDominik Schürmann2016-03-101-16/+16
| | | | |
| * | | | 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-075-84/+81
| |\ \ \ | | | | | | | | | | | | | | | into kepuss-okHttpLinkedToken
| | * | | dependency removedMichal Kepkowski2016-03-051-2/+0
| | | | |
| | * | | okHttpMichal Kepkowski2016-03-044-82/+81
| | | | |
| * | | | Version 3.9.2Dominik Schürmann2016-03-071-2/+2
| | | | |
| * | | | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
| | | | |