bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed NullPointerException when accessing outbox items

Browse Source
This commit is contained in:
Christian Basler 2017-05-17 12:24:13 +02:00
parent 73944b5883
commit bf070da20a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -38,7 +38,7 @@ android {
} }
//ext.jabitVersion = '2.0.4' //ext.jabitVersion = '2.0.4'
ext.jabitVersion = 'feature-extended-encoding-SNAPSHOT' ext.jabitVersion = 'development-SNAPSHOT'
ext.supportVersion = '25.3.1' ext.supportVersion = '25.3.1'
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])

2
app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java
View File

@ -100,7 +100,7 @@ public class AndroidInventory implements Inventory {
while (c.moveToNext()) { while (c.moveToNext()) {
byte[] blob = c.getBlob(c.getColumnIndex(COLUMN_HASH)); byte[] blob = c.getBlob(c.getColumnIndex(COLUMN_HASH));
long expires = c.getLong(c.getColumnIndex(COLUMN_EXPIRES)); 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()); LOG.info("Stream #" + stream + " inventory size: " + result.size());

2
app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java
View File

@ -272,7 +272,7 @@ public class AndroidMessageRepository extends AbstractMessageRepository {
new ByteArrayInputStream(data)); new ByteArrayInputStream(data));
long id = c.getLong(c.getColumnIndex(COLUMN_ID)); long id = c.getLong(c.getColumnIndex(COLUMN_ID));
builder.id(id); builder.id(id);
builder.IV(new InventoryVector(iv)); builder.IV(InventoryVector.fromHash(iv));
builder.from(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex builder.from(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex
(COLUMN_SENDER)))); (COLUMN_SENDER))));
builder.to(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex builder.to(ctx.getAddressRepository().getAddress(c.getString(c.getColumnIndex

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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' classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong