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

Fixed sending messages

Browse Source
This commit is contained in:
Christian Basler 2016-08-13 23:24:42 +02:00
parent f0e03f15a3
commit e102908acf
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/ch/dissem/apps/abit/repository/AndroidProofOfWorkRepository.java
View File

@ -29,6 +29,7 @@ import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import ch.dissem.bitmessage.InternalContext;
import ch.dissem.bitmessage.entity.ObjectMessage; import ch.dissem.bitmessage.entity.ObjectMessage;
import ch.dissem.bitmessage.factory.Factory; import ch.dissem.bitmessage.factory.Factory;
import ch.dissem.bitmessage.ports.ProofOfWorkRepository; import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
@ -40,7 +41,8 @@ import static ch.dissem.bitmessage.utils.Singleton.cryptography;
/** /**
* @author Christian Basler * @author Christian Basler
*/ */
public class AndroidProofOfWorkRepository implements ProofOfWorkRepository { public class AndroidProofOfWorkRepository implements ProofOfWorkRepository, InternalContext
.ContextHolder {
private static final Logger LOG = LoggerFactory.getLogger(AndroidProofOfWorkRepository.class); private static final Logger LOG = LoggerFactory.getLogger(AndroidProofOfWorkRepository.class);
private static final String TABLE_NAME = "POW"; private static final String TABLE_NAME = "POW";
@ -53,11 +55,17 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
private static final String COLUMN_MESSAGE_ID = "message_id"; private static final String COLUMN_MESSAGE_ID = "message_id";
private final SqlHelper sql; private final SqlHelper sql;
private InternalContext bmc;
public AndroidProofOfWorkRepository(SqlHelper sql) { public AndroidProofOfWorkRepository(SqlHelper sql) {
this.sql = sql; this.sql = sql;
} }
@Override
public void setContext(InternalContext internalContext) {
this.bmc = internalContext;
}
@Override @Override
public Item getItem(byte[] initialHash) { public Item getItem(byte[] initialHash) {
// Define a projection that specifies which columns from the database // Define a projection that specifies which columns from the database
@ -66,7 +74,9 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
COLUMN_DATA, COLUMN_DATA,
COLUMN_VERSION, COLUMN_VERSION,
COLUMN_NONCE_TRIALS_PER_BYTE, COLUMN_NONCE_TRIALS_PER_BYTE,
COLUMN_EXTRA_BYTES COLUMN_EXTRA_BYTES,
COLUMN_EXPIRATION_TIME,
COLUMN_MESSAGE_ID
}; };
SQLiteDatabase db = sql.getReadableDatabase(); SQLiteDatabase db = sql.getReadableDatabase();
@ -79,12 +89,24 @@ public class AndroidProofOfWorkRepository implements ProofOfWorkRepository {
if (!c.isAfterLast()) { if (!c.isAfterLast()) {
int version = c.getInt(c.getColumnIndex(COLUMN_VERSION)); int version = c.getInt(c.getColumnIndex(COLUMN_VERSION));
byte[] blob = c.getBlob(c.getColumnIndex(COLUMN_DATA)); byte[] blob = c.getBlob(c.getColumnIndex(COLUMN_DATA));
return new Item( if (c.isNull(c.getColumnIndex(COLUMN_MESSAGE_ID))) {
Factory.getObjectMessage(version, new ByteArrayInputStream(blob), blob return new Item(
.length), Factory.getObjectMessage(version, new ByteArrayInputStream(blob), blob
c.getLong(c.getColumnIndex(COLUMN_NONCE_TRIALS_PER_BYTE)), .length),
c.getLong(c.getColumnIndex(COLUMN_EXTRA_BYTES)) c.getLong(c.getColumnIndex(COLUMN_NONCE_TRIALS_PER_BYTE)),
); c.getLong(c.getColumnIndex(COLUMN_EXTRA_BYTES))
);
} else {
return new Item(
Factory.getObjectMessage(version, new ByteArrayInputStream(blob), blob
.length),
c.getLong(c.getColumnIndex(COLUMN_NONCE_TRIALS_PER_BYTE)),
c.getLong(c.getColumnIndex(COLUMN_EXTRA_BYTES)),
c.getLong(c.getColumnIndex(COLUMN_EXPIRATION_TIME)),
bmc.getMessageRepository().getMessage(
c.getLong(c.getColumnIndex(COLUMN_MESSAGE_ID)))
);
}
} }
} }
throw new RuntimeException("Object requested that we don't have. Initial hash: " + throw new RuntimeException("Object requested that we don't have. Initial hash: " +