Add support for dependency injection, and accompanying tests.

This commit is contained in:
Moxie Marlinspike
2014-11-11 19:57:53 -08:00
parent 601e233d47
commit 9a6f65988f
31 changed files with 663 additions and 336 deletions

View File

@@ -62,9 +62,8 @@ public class SmsDecryptJob extends MasterSecretJob {
}
@Override
public void onRun() throws RequirementNotMetException, NoSuchMessageException {
MasterSecret masterSecret = getMasterSecret();
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
public void onRun(MasterSecret masterSecret) throws NoSuchMessageException {
EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
try {
SmsMessageRecord record = database.getMessage(masterSecret, messageId);
@@ -94,6 +93,11 @@ public class SmsDecryptJob extends MasterSecretJob {
}
}
@Override
public boolean onShouldRetryThrowable(Throwable throwable) {
return false;
}
@Override
public void onCanceled() {
// TODO
@@ -166,12 +170,6 @@ public class SmsDecryptJob extends MasterSecretJob {
}
}
@Override
public boolean onShouldRetry(Throwable throwable) {
if (throwable instanceof RequirementNotMetException) return true;
return false;
}
private String getAsymmetricDecryptedBody(MasterSecret masterSecret, String body)
throws InvalidMessageException
{