PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
7,289 Commits
1 Branch
1 Tag
81 MiB
master
5.7.5-20221212
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'master'
${ noResults }
Commit Graph

72 Commits (master)

Author SHA1 Message Date
Vincent Breitmoser 13e9e91fdc more build system updates, ditch unused android tests 3 years ago
Vincent Breitmoser 4a4093854d use upstream bouncycastle provider 3 years ago
Vincent Breitmoser 864fbc95ea re-merge libkeychain 3 years ago
Vincent Breitmoser d3e48db520 ditch keybase 3 years ago
Vincent Breitmoser 573ea47a40 ditch safeslinger 3 years ago
Vincent Breitmoser 365cebdc72 extract sweetspot activity into separate module 5 years ago
Vincent Breitmoser 053cbdf43e include MaterialChipsInput as subdir lib 5 years ago
Christian Hagau 2619cb1db3 Add sshauthentication-api v1 support 6 years ago
Dominik Schürmann 967bebb99c Init libkeychain and move some utils 6 years ago
Dominik Schürmann 8d0c747bc9 Remove openkeychain-api gradle deps 6 years ago
Dominik Schürmann e08ae31797 Remove old keybase path 7 years ago
Dominik Schürmann 8bcd4003a9 KeybaseLib workaround 7 years ago
Dominik Schürmann 115c46d015 Update Android Gradle Plugin to 2.0 with workarounds 7 years ago
Dominik Schürmann 79db5c0ebe Replace spongycastle with bouncycastle 7 years ago
Dominik Schürmann 574d20e0c3 Remove spongycastle pkix dependency to stay below Androids dex limit 8 years ago
Vincent Breitmoser dc81e0254c use snackbar from repository (again), and update to 2.11.0 
This release merged our pull requests for round corners on tablet for top line,
and nicer dismiss-on-swipe animation.

https://github.com/nispok/snackbar/pull/134
https://github.com/nispok/snackbar/pull/135
 8 years ago
Vincent Breitmoser 4cef97be5f update safeslinger lib (closes #1434) 8 years ago
Vincent Breitmoser b59be903c3 Revert "Use snackbar lib from maven repo" 
This reverts commit bfc57aefa5.

Conflicts:
	OpenKeychain/build.gradle
	settings.gradle
 8 years ago
Dominik Schürmann d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 8 years ago
Dominik Schürmann bfc57aefa5 Use snackbar lib from maven repo 8 years ago
Dominik Schürmann afc91fb918 Switch to new library repos 8 years ago
Dominik Schürmann 66554607d0 Remove unused includes in settings.gradle 8 years ago
Dominik Schürmann fd09b9d380 Remove html-textview reference from settings.gradle 8 years ago
Vincent Breitmoser 8b4388e1a2 use top line in snackbar for status indication 8 years ago
Dominik Schürmann 1a12eb1a7a Cleanup settings.gradle 8 years ago
Dominik Schürmann 85b6669625 Integrate QR Code library instead of requiring the app to be installed, also due to security reasons 8 years ago
Dominik Schürmann 320f825878 Add android-lockpattern library 9 years ago
Dominik Schürmann d8e6e51452 Fix test for future creation timestamps to account for loosen timestamp check 9 years ago
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 9 years ago
Dominik Schürmann 6b90de2489 Fix tests 9 years ago
Dominik Schürmann be199b844c Cleanup tests 9 years ago
Dominik Schürmann a1323a1a14 deactivate screenshots in new PassphraseDialogActivity 9 years ago
Dominik Schürmann cf8978b86d Revert "Fix test" 
This reverts commit f392d95ac3.
 9 years ago
Dominik Schürmann f392d95ac3 Fix test 9 years ago
Dominik Schürmann d0f46f1efb Integrate safeslinger share 9 years ago
Dominik Schürmann 10e96dff43 Add safeslinger to build 9 years ago
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
 9 years ago
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
 9 years ago
mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more 
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
 9 years ago
Dominik Schürmann 2f5c73746d Merge branch 'master' into yubikey 9 years ago
Vincent Breitmoser 6d9eaaabb2 work on test prepare script, make the whole thing optional 9 years ago
Dominik Schürmann 3cce00d61e add lib dependency, update lib 9 years ago
mar-v-in bc9922263c Add TokenAutoComplete to gradle 9 years ago
Vincent Breitmoser d4c1b781db test: add algorithm choice tests 9 years ago
Vincent Breitmoser d4fa2bbf47 test: make testing optional in build 9 years ago
Vincent Breitmoser 718acbf954 put unit tests into external module (CAVEAT) 
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
 9 years ago
Vincent Breitmoser d044daeedd get rid of AppMsg library 9 years ago
Daniel Albert f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 9 years ago
mar-v-in 2b18dc741a Switch to dnsjava 9 years ago
Tim Bray 17f43ad21b Moved Keybase stuff into KeybaseLib submodule 9 years ago