PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into development

Browse source
This commit is contained in:
Dominik Schürmann 2015-01-30 10:10:25 +01:00
parent 3c2f9ce0da 34b664f4b6
commit c2c28fab7b
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 {
compileSdkVersion 21
buildToolsVersion '21.1.1'
buildToolsVersion '21.1.2'
defaultConfig {
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!");
}
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);