Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 9 | -123/+185 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -4/+4 |
| | | |||||
| * | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 1 | -18/+33 |
| |\ | | | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | ||||
| | * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 1 | -3/+1 |
| | | | |||||
| | * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 1 | -18/+35 |
| | | | |||||
| * | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 1 | -33/+12 |
| | | | |||||
| * | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 1 | -1/+21 |
| | | | |||||
| * | | Remove unused AlgorithmNames | Dominik Schürmann | 2015-04-10 | 1 | -93/+0 |
| | | | |||||
| * | | Add license headers | Dominik Schürmann | 2015-04-10 | 3 | -0/+51 |
| | | | |||||
| * | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 1 | -0/+95 |
| | | | |||||
| * | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 1 | -7/+2 |
| |/ | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 2 | -8/+17 |
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -8/+5 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
| * | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 4 | -32/+393 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -5/+4 |
| | | |||||
| * | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 1 | -1/+2 |
| | | |||||
| * | Updated GNU header | Kent | 2015-03-20 | 1 | -1/+2 |
| | | |||||
| * | Removed create and added GPLv3 header | Kent | 2015-03-20 | 1 | -4/+17 |
| | | |||||
| * | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 1 | -0/+204 |
| | | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | ||||
| * | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 1 | -15/+0 |
| | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | ||||
| * | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 |
| | | |||||
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 1 | -0/+4 |
| | | |||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -0/+131 |
| | | |||||
| * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -11/+10 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 2 | -37/+261 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Merge pull request #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 1 | -10/+12 |
| |\ | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se... | ||||
| | * | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid | ||||
| * | | Use names also for main contact | Dominik Schürmann | 2015-03-14 | 1 | -3/+3 |
| | | | |||||
| * | | Show key name instead of key id in contacts, cleanup | Dominik Schürmann | 2015-03-14 | 1 | -20/+7 |
| |/ | |||||
| * | added some documentation | Adithya Abraham Philip | 2015-03-13 | 1 | -23/+82 |
| | | |||||
| * | added own profile support in linekd system contact | Adithya Abraham Philip | 2015-03-13 | 1 | -3/+36 |
| | | |||||
| * | links own keys to me profile in contacts | Adithya Abraham Philip | 2015-03-13 | 1 | -9/+118 |
| | | |||||
| * | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 1 | -1/+1 |
| |\ | | | | | | | #1042: Replaced ints with enums | ||||
| | * | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
| * | | corrected linked system contact display name | Adithya Abraham Philip | 2015-03-11 | 1 | -3/+37 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 1 | -6/+48 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | ||||
| * | | Ripple | Dominik Schürmann | 2015-03-10 | 1 | -3/+1 |
| | | | |||||
| * | | added CALLER_IS_SYNCADAPTER parameter to delete queries | Adithya Abraham Philip | 2015-03-10 | 1 | -3/+47 |
| |/ | |||||
* / | filter out unknown linked ids | Vincent Breitmoser | 2015-03-10 | 1 | -0/+76 |
|/ | |||||
* | Remove dublicate email check | Dominik Schürmann | 2015-03-06 | 1 | -3/+1 |
| | |||||
* | Improve way of getting possible names by filtering out emails | Dominik Schürmann | 2015-03-06 | 1 | -1/+25 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -91/+0 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | Remove preferences multi process min sdk check | Dominik Schürmann | 2015-03-05 | 1 | -6/+2 |
| | |||||
* | Debug options | Dominik Schürmann | 2015-03-05 | 1 | -1/+3 |
| | |||||
* | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 1 | -1/+9 |
| | |||||
* | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -2/+4 |
| | |||||
* | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 1 | -4/+5 |
| |