aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix focusing with To fieldmar-v-in2014-08-021-0/+2
| |
| * Encrypt UI (drop downs)mar-v-in2014-08-012-14/+35
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-08-011-1/+1
| |\
| * \ Merge branch 'master' into improve-file-moremar-v-in2014-08-0110-51/+99
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
| * | | Fix string resourcesmar-v-in2014-07-312-5/+6
| | | |
| * | | Fix mergemar-v-in2014-07-311-0/+2
| | | |
| * | | Merge branch 'master' into improve-file-moremar-v-in2014-07-31136-672/+1008
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
| * | | | - add multi select for storage api (kitkat)mar-v-in2014-07-314-30/+27
| | | | | | | | | | | | | | | | | | | | | | | | | - UI fixes - refactoring
| * | | | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-203-13/+43
| | | | |
| * | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0636-483/+1601
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml
| * | | | | Many changes to file ... and still incompletemar-v-in2014-07-0624-237/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Multi file - Reworked UI
| * | | | | Encrypt/Decrypt UI workmar-v-in2014-07-024-79/+110
| | | | | |
| * | | | | Merge branch 'master' into improve-file-moremar-v-in2014-07-0163-115/+578
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * \ \ \ \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-243-10/+83
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:mar-v-in/open-keychain into ↵mar-v-in2014-06-225-38/+73
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | improve-file-more
| * | | | | | | | Improve file more, Part 1mar-v-in2014-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* | | | | | | | | Add user id with dialogDominik Schürmann2014-08-017-70/+64
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | identity instead of credentialsDominik Schürmann2014-08-011-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Start fixing CachedPublicKeyRingDominik Schürmann2014-08-011-1/+0
| | | | | | |
* | | | | | | Certifying instead of signingDominik Schürmann2014-08-011-0/+1
| | | | | | |
* | | | | | | move upload/update buttons from menu to buttonsVincent Breitmoser2014-07-314-19/+47
| | | | | | |
* | | | | | | Remove private/secret key language from stringsDominik Schürmann2014-07-311-9/+5
| | | | | | |
* | | | | | | Fixes for uploadDominik Schürmann2014-07-311-0/+1
| | | | | | |
* | | | | | | Create key: design fixesDominik Schürmann2014-07-318-22/+45
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix animations in create keyDominik Schürmann2014-07-312-25/+13
| | | | | |
* | | | | | Add notify layouts to some activitiesDominik Schürmann2014-07-314-80/+104
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-311-0/+14
|\ \ \ \ \ \
| * | | | | | completely overengineer progress indication in {modify,create}SecretKeyRing ↵Vincent Breitmoser2014-07-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | methods
* | | | | | | Robots like coffee too...Dominik Schürmann2014-07-319-15/+36
|/ / / / / /
* | | | | | Fix stringDominik Schürmann2014-07-311-1/+1
| | | | | |
* | | | | | Keyserver exception translateableDominik Schürmann2014-07-319-21/+23
| | | | | |
* | | | | | Smaller notesDominik Schürmann2014-07-311-1/+1
| | | | | |
* | | | | | Exception handling with keyserver queriesDominik Schürmann2014-07-311-1/+1
| | | | | |
* | | | | | Better exception handling for import of keysDominik Schürmann2014-07-316-6/+6
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
|\ \ \ \ \ \
| * | | | | | couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
| | | | | | |
* | | | | | | Create key: work on uploadDominik Schürmann2014-07-303-182/+219
|/ / / / / /
* | | | | | Create key: repeat passphraseDominik Schürmann2014-07-303-4/+14
| | | | | |
* | | | | | Create key: uploadDominik Schürmann2014-07-301-0/+2
| | | | | |
* | | | | | Fix drawer in key listDominik Schürmann2014-07-301-4/+4
| | | | | |
* | | | | | Create key: layout above buttonsDominik Schürmann2014-07-302-4/+8
| | | | | |
* | | | | | Fix conflictsDominik Schürmann2014-07-301-2/+23
| | | | | |
* | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-3012-70/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
| * \ \ \ \ \ Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-2912-70/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
| | * | | | | | introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-277-7/+7
| | | | | | | |
| | * | | | | | some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-275-67/+21
| | | | | | | |
| | * | | | | | Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-2611-227/+183
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| | * | | | | | | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-073-1/+7
| | | | | | | | |
| | * | | | | | | get rid of AppMsg libraryVincent Breitmoser2014-07-071-0/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | / | | | | | Create key with fragmentsDominik Schürmann2014-07-309-80/+261
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 08:05:23 +0000