Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

WIP db transaction for DistributedBackupActivity

Browse Source
This commit is contained in:
ameba23
2021-03-08 17:08:19 +01:00
parent 6c079e172a
commit 57605d55ce
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
View File

@@ -6,6 +6,8 @@ import android.widget.Toast;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactId;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
@@ -14,6 +16,7 @@ import org.briarproject.briar.android.fragment.BaseFragment;
import org.briarproject.briar.api.socialbackup.SocialBackupManager; import org.briarproject.briar.api.socialbackup.SocialBackupManager;
import java.util.Collection; import java.util.Collection;
import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
@@ -23,13 +26,15 @@ public class DistributedBackupActivity extends BriarActivity implements
private Collection<ContactId> custodians; private Collection<ContactId> custodians;
private SocialBackupManager socialBackupManager; private SocialBackupManager socialBackupManager;
private DatabaseComponent db;
DistributedBackupActivity() { public DistributedBackupActivity() {
} }
@Inject @Inject
DistributedBackupActivity(SocialBackupManager socialBackupManager) { public DistributedBackupActivity(SocialBackupManager socialBackupManager, DatabaseComponent db) {
this.socialBackupManager = socialBackupManager; this.socialBackupManager = socialBackupManager;
this.db = db;
} }
@Override @Override
@@ -62,11 +67,12 @@ public class DistributedBackupActivity extends BriarActivity implements
} }
@Override @Override
public void thresholdDefined(int threshold) { public void thresholdDefined(int threshold) throws DbException {
// TODO this is the place to call db.transaction(false, txn -> {
//socialBackupManager.createBackup(); socialBackupManager.createBackup(txn, (List<ContactId>) custodians, threshold);
ShardsSentFragment fragment = new ShardsSentFragment(); ShardsSentFragment fragment = new ShardsSentFragment();
showNextFragment(fragment); showNextFragment(fragment);
});
} }
@Override @Override

4
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdDefinedListener.java
View File

@@ -1,10 +1,12 @@
package org.briarproject.briar.android.socialbackup; package org.briarproject.briar.android.socialbackup;
import org.briarproject.bramble.api.db.DbException;
import androidx.annotation.UiThread; import androidx.annotation.UiThread;
public interface ThresholdDefinedListener { public interface ThresholdDefinedListener {
@UiThread @UiThread
void thresholdDefined(int threshold); void thresholdDefined(int threshold) throws DbException;
} }

7
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/ThresholdSelectorFragment.java
View File

@@ -16,6 +16,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.contactselection.ContactSelectorListener; import org.briarproject.briar.android.contactselection.ContactSelectorListener;
@@ -110,7 +111,11 @@ public class ThresholdSelectorFragment extends BaseFragment {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_threshold_defined: case R.id.action_threshold_defined:
listener.thresholdDefined(threshold); try {
listener.thresholdDefined(threshold);
} catch (DbException e) {
e.printStackTrace();
}
return true; return true;
default: default:
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);