aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-249-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, cleanupDominik Schürmann2015-04-151-4/+4
| |
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-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 presentAdithya Abraham Philip2015-04-081-3/+1
| | |
| | * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-081-18/+35
| | |
| * | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-131-33/+12
| | |
| * | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-101-1/+21
| | |
| * | Remove unused AlgorithmNamesDominik Schürmann2015-04-101-93/+0
| | |
| * | Add license headersDominik Schürmann2015-04-103-0/+51
| | |
| * | Externalize Parcelable cachingDominik Schürmann2015-04-101-0/+95
| | |
| * | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+1
| | |
| * | Fixing crashes with new encrypt uiDominik Schürmann2015-03-291-7/+2
| |/
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-092-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 serviceAdithya Abraham Philip2015-03-231-8/+5
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| * introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+12
| | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-32/+393
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Reworked Notify classManoj Khanna2015-03-201-5/+4
| |
| * Fix API RESULT_TYPEDominik Schürmann2015-03-201-1/+2
| |
| * Updated GNU headerKent2015-03-201-1/+2
| |
| * Removed create and added GPLv3 headerKent2015-03-201-4/+17
| |
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-201-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 ViewKeyActivityManoj Khanna2015-03-191-15/+0
| | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| |
| * Fix tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| |
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-0/+131
| |
| * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| |
| * object oriented split user idDominik Schürmann2015-03-161-11/+10
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-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/developmentDominik Schürmann2015-03-151-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 Ramos2015-03-151-10/+12
| | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid
| * | Use names also for main contactDominik Schürmann2015-03-141-3/+3
| | |
| * | Show key name instead of key id in contacts, cleanupDominik Schürmann2015-03-141-20/+7
| |/
| * added some documentationAdithya Abraham Philip2015-03-131-23/+82
| |
| * added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-3/+36
| |
| * links own keys to me profile in contactsAdithya Abraham Philip2015-03-131-9/+118
| |
| * Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-121-1/+1
| |\ | | | | | | #1042: Replaced ints with enums
| | * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
| * | corrected linked system contact display nameAdithya Abraham Philip2015-03-111-3/+37
| | |
* | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-6/+48
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * | RippleDominik Schürmann2015-03-101-3/+1
| | |
| * | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
| |/
* / filter out unknown linked idsVincent Breitmoser2015-03-101-0/+76
|/
* Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
|
* Improve way of getting possible names by filtering out emailsDominik Schürmann2015-03-061-1/+25
|
* Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-051-91/+0
| | | | activites, select hash and encryption algo based on hardcoded preferred lists
* Remove preferences multi process min sdk checkDominik Schürmann2015-03-051-6/+2
|
* Debug optionsDominik Schürmann2015-03-051-1/+3
|
* Better selection of preferred algorithmDominik Schürmann2015-03-051-1/+9
|
* Simplified language: Confirm keysDominik Schürmann2015-03-041-2/+4
|
* Get high res version of contact photoDominik Schürmann2015-03-041-4/+5
|