moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-02 13:32:19 -05:00
Code Issues Releases Wiki Activity

Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-30 10:10:13 +01:00
commit 34b664f4b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/build.gradle
View File

@ -32,7 +32,7 @@ dependencies {
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion '21.1.1' buildToolsVersion '21.1.2'
defaultConfig { defaultConfig {
minSdkVersion 15 minSdkVersion 15

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
View File

@ -699,7 +699,7 @@ public class KeychainProvider extends ContentProvider {
)) { )) {
throw new AssertionError("Incorrect type for user packet! This is a bug!"); throw new AssertionError("Incorrect type for user packet! This is a bug!");
} }
if (values.get(UserPacketsColumns.RANK) == 0 && values.get(UserPacketsColumns.USER_ID) == null) { if (((Number)values.get(UserPacketsColumns.RANK)).intValue() == 0 && values.get(UserPacketsColumns.USER_ID) == null) {
throw new AssertionError("Rank 0 user packet must be a user id!"); throw new AssertionError("Rank 0 user packet must be a user id!");
} }
db.insertOrThrow(Tables.USER_PACKETS, null, values); db.insertOrThrow(Tables.USER_PACKETS, null, values);