aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util
Commit message (Collapse)AuthorAgeFilesLines
...
* make use of proxies a Keyserver propertyVincent Breitmoser2015-10-291-7/+6
|
* use Proxy.NO_PROXY instead of null value for no proxyVincent Breitmoser2015-10-292-5/+8
|
* uploadop: clean up, add loggingVincent Breitmoser2015-10-292-0/+9
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-261-3/+6
|\
* | fix FileHelper class for pre-lollipop devicesVincent Breitmoser2015-10-262-43/+86
|/
* fix argument order screwup in FileHelperVincent Breitmoser2015-10-221-1/+1
|
* Fix keybase verificationDominik Schürmann2015-10-211-20/+17
|
* Remove default PIN settingDominik Schürmann2015-10-161-10/+0
|
* Cleanup, fix advanced sharingDominik Schürmann2015-10-151-125/+0
|
* Mime type consistencyDominik Schürmann2015-10-151-1/+1
|
* Show the Internal Storage menu item on openFileDominik Schürmann2015-10-151-4/+4
|
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-091-0/+64
|\
| * make openInputStreamSafe static and move to FileHelperVincent Breitmoser2015-10-091-9/+74
| |
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-081-104/+0
|\|
| * Remove ShareHelper: Not compat with Android >= 5, reduce code complexityDominik Schürmann2015-10-081-104/+0
| |
* | use annotations for android sdk constraintsVincent Breitmoser2015-09-281-33/+25
| |
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-287-138/+146
|\|
| * Harden parsing of keyserver results (OKC-01-003)Dominik Schürmann2015-09-251-2/+1
| |
| * Cleanup FileHelperDominik Schürmann2015-09-241-11/+10
| |
| * Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-242-71/+9
| |
| * Fix some illegal state exceptionsDominik Schürmann2015-09-241-0/+4
| |
| * Pin keybase certificateDominik Schürmann2015-09-211-20/+25
| |
| * Use more modular Keybase lib with OkHttp wrapperDominik Schürmann2015-09-212-0/+91
| |
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵Dominik Schürmann2015-09-201-55/+27
| | | | | | | | add (OKC-01-018)
* | export: support encrypted export, first versionVincent Breitmoser2015-09-281-1/+1
| |
* | remove "export to file" code path from export operationVincent Breitmoser2015-09-261-1/+1
|/
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-0/+76
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-1/+48
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * \ \ 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
| * \ \ \ 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
| * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-32/+393
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ \ 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 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
| * | | | | | | | filter out unknown linked idsVincent Breitmoser2015-03-101-0/+76
| | | | | | | | |
* | | | | | | | | Make keybase an experimental featureDominik Schürmann2015-08-281-0/+10
| | | | | | | | |
* | | | | | | | | some cleanup in FileHelper, and allow input of filename during exportVincent Breitmoser2015-08-272-82/+117
| | | | | | | | |
* | | | | | | | | Experimental features settings reworkedDominik Schürmann2015-08-271-6/+15
| | | | | | | | |
* | | | | | | | | Experimental feature settingDominik Schürmann2015-08-271-1/+13
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-241-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | trigger indexing of file after operation (#1498)Vincent Breitmoser2015-08-221-1/+6
| | | | | | | | | |
* | | | | | | | | | Move proxy pref values out of stringsDominik Schürmann2015-08-241-7/+10
|/ / / / / / / / /
* | | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-202-3/+8
| | | | | | | | |
* | | | | | | | | reworked keyserversyncadapterservice flowAdithya Abraham Philip2015-08-201-12/+24
| | | | | | | | |
* | | | | | | | | Lock orientation for yubikey operationsDominik Schürmann2015-08-121-0/+85
| | | | | | | | |
* | | | | | | | | updated OrbotHelper with silent startAdithya Abraham Philip2015-08-063-79/+293
| | | | | | | | |
* | | | | | | | | Fix preference version handlingThialfihar2015-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move preference upgrade of theme to version 4 of the preferences. The upgrade is meant FROM that version to the next.
* | | | | | | | | Use a constant for the default value of the themeThialfihar2015-07-211-1/+1
| | | | | | | | |
* | | | | | | | | Rename updatePreferences() to upgradePreferences()Thialfihar2015-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is really an upgrade of the preference store and not an update of values, it also is consistent with SQLiteOpenHelper.onUpgrade().
* | | | | | | | | Refactor theme preference values into constantsThialfihar2015-07-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also explicitly set a theme via preference updating to the default.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 14:57:37 +0000