diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-30 10:10:25 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-30 10:10:25 +0100 |
| commit | c2c28fab7be9a095b95e65f938b2a450bac6dfbc (patch) | |
| tree | f83759d061055f249edbe06ab08f1ff21b4915a4 /OpenKeychain | |
| parent | 3c2f9ce0da9139549644c4216c5bc855ef39a534 (diff) | |
| parent | 34b664f4b63316fbcd5b362d11616b32579a0e30 (diff) | |
| download | open-keychain-c2c28fab7be9a095b95e65f938b2a450bac6dfbc.tar.gz open-keychain-c2c28fab7be9a095b95e65f938b2a450bac6dfbc.tar.bz2 open-keychain-c2c28fab7be9a095b95e65f938b2a450bac6dfbc.zip | |
Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into development
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/build.gradle | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 3bcfdda5e..eca62026a 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -32,7 +32,7 @@ dependencies { android { compileSdkVersion 21 - buildToolsVersion '21.1.1' + buildToolsVersion '21.1.2' defaultConfig { minSdkVersion 15 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index 6bd88570f..2ffc8c2ca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -699,7 +699,7 @@ public class KeychainProvider extends ContentProvider { )) { 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!"); } db.insertOrThrow(Tables.USER_PACKETS, null, values); |