aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/AndroidManifest.xml
Commit message (Collapse)AuthorAgeFilesLines
* Fix debug backup/restore methodsDominik Schürmann2014-08-041-1/+1
|
* Smaller UI fixesDominik Schürmann2014-08-041-25/+18
|
* Merge branch 'master' into improve-file-moremar-v-in2014-07-311-27/+186
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * More file association hacks for AndroidManifest and key importDominik Schürmann2014-07-311-3/+157
| |
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-291-5/+0
| |\ | | | | | | | | | | | | | | | | | | 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
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-261-2/+7
| | |\ | | | | | | | | | | | | | | | | | | | | 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-071-5/+0
| | | |
| * | | Redesigned QR Code viewDominik Schürmann2014-07-271-0/+4
| | | |
| * | | Open keyboard on passphrase dialog, this should now work on all Android ↵Dominik Schürmann2014-07-271-17/+15
| | | | | | | | | | | | | | | | versions... hopefully
| * | | Work on first time wizard designDominik Schürmann2014-07-271-1/+5
| | |/ | |/|
| * | New first time screenDominik Schürmann2014-07-161-2/+7
| |/
* | - add multi select for storage api (kitkat)mar-v-in2014-07-311-2/+3
| | | | | | | | | | - UI fixes - refactoring
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-2/+2
|\| | | | | | | | | | | | | | | | | 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
| * Remove old edit button, rename activitiesDominik Schürmann2014-07-031-2/+2
| |
* | Many changes to file ... and still incompletemar-v-in2014-07-061-0/+1
| | | | | | | | | | - Multi file - Reworked UI
* | Add temporary file storage as discussed in #665mar-v-in2014-07-011-0/+9
|/ | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
* Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-0/+1
|
* Start work on a first-time wizardDominik Schürmann2014-06-271-0/+5
|
* Start new designed activityDominik Schürmann2014-06-211-0/+5
|
* Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵Dominik Schürmann2014-06-181-1/+1
| | | | naming conventions
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-131-0/+33
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
| * Show keys with android contactsmar-v-in2014-06-051-0/+6
| | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
| * First version of automatic contact discovery.mar-v-in2014-06-041-0/+26
| | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
| * ContactHelper can read email addresses from contact listmar-v-in2014-05-261-0/+1
| |
* | import-log: add LogDisplay activityVincent Breitmoser2014-06-101-0/+6
|/
* Version 2.7Dominik Schürmann2014-05-081-2/+2
|
* Better handling of actionbars backDominik Schürmann2014-05-071-2/+12
|
* Version 2.6.1Dominik Schürmann2014-04-221-2/+2
|
* version 2.6Dominik Schürmann2014-04-191-2/+2
|
* OK 2.6 RC1Dominik Schürmann2014-04-171-2/+2
|
* add up navigation in ViewCertActivityVincent Breitmoser2014-04-171-1/+1
| | | | Fixes #567
* Update comments in AndroidManifestDominik Schürmann2014-04-171-4/+6
|
* Version 2.6 beta1Dominik Schürmann2014-04-161-2/+2
|
* Remove unused blob classes and other dead codeDominik Schürmann2014-04-131-26/+3
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-0/+450