cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DatabaseInteractor -> KeyRepository

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-02-24 18:24:11 +01:00
parent c7e01926e1
commit 2124a4598a
65 changed files with 419 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/NfcHelper.java
View File

@@ -39,8 +39,8 @@ import android.provider.Settings;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.provider.DatabaseInteractor;
import org.sufficientlysecure.keychain.provider.DatabaseInteractor.NotFoundException;
import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeyRepository.NotFoundException;
import org.sufficientlysecure.keychain.ui.util.Notify;
/**
@@ -50,7 +50,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify;
public class NfcHelper {
private Activity mActivity;
private DatabaseInteractor mDatabaseInteractor;
private KeyRepository mKeyRepository;
/**
* NFC: This handler receives a message from onNdefPushComplete
@@ -66,9 +66,9 @@ public class NfcHelper {
/**
* Initializes the NfcHelper.
*/
public NfcHelper(final Activity activity, final DatabaseInteractor databaseInteractor) {
public NfcHelper(final Activity activity, final KeyRepository keyRepository) {
mActivity = activity;
mDatabaseInteractor = databaseInteractor;
mKeyRepository = keyRepository;
mNfcHandler = new NfcHandler(mActivity);
}
@@ -128,9 +128,9 @@ public class NfcHelper {
new AsyncTask<Void, Void, Void>() {
protected Void doInBackground(Void... unused) {
try {
long masterKeyId = mDatabaseInteractor.getCachedPublicKeyRing(dataUri)
long masterKeyId = mKeyRepository.getCachedPublicKeyRing(dataUri)
.extractOrGetMasterKeyId();
mNfcKeyringBytes = mDatabaseInteractor.loadPublicKeyRingData(masterKeyId);
mNfcKeyringBytes = mKeyRepository.loadPublicKeyRingData(masterKeyId);
} catch (NotFoundException | PgpKeyNotFoundException e) {
Log.e(Constants.TAG, "key not found!", e);
}