From bf070da20a578e0a3d3f13aa3c60210fc5ffece1 Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Wed, 17 May 2017 12:24:13 +0200 Subject: [PATCH] Fixed NullPointerException when accessing outbox items --- app/build.gradle | 2 +- .../java/ch/dissem/apps/abit/repository/AndroidInventory.java | 2 +- .../dissem/apps/abit/repository/AndroidMessageRepository.java | 2 +- build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 76984f3..e2150b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { } //ext.jabitVersion = '2.0.4' -ext.jabitVersion = 'feature-extended-encoding-SNAPSHOT' +ext.jabitVersion = 'development-SNAPSHOT' ext.supportVersion = '25.3.1' dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) diff --git a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java index 8632679..6b7720f 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java @@ -100,7 +100,7 @@ public class AndroidInventory implements Inventory { while (c.moveToNext()) { byte[] blob = c.getBlob(c.getColumnIndex(COLUMN_HASH)); long expires = c.getLong(c.getColumnIndex(COLUMN_EXPIRES)); - result.put(new InventoryVector(blob), expires); + result.put(InventoryVector.fromHash(blob), expires); } } LOG.info("Stream #" + stream + " inventory size: " + result.size()); diff --git a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java index d869ee8..8d44495 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java @@ -272,7 +272,7 @@ public class AndroidMessageRepository extends AbstractMessageRepository { new ByteArrayInputStream(data)); long id = c.getLong(c.getColumnIndex(COLUMN_ID)); builder.id(id); - builder.IV(new InventoryVector(iv)); + builder.IV(InventoryVector.fromHash(iv)); builder.from(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex (COLUMN_SENDER)))); builder.to(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex diff --git a/build.gradle b/build.gradle index ceae43c..51bb49b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' // NOTE: Do not place your application dependencies here; they belong