Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

[android] Show snackbar when there is no internet connection

Browse Source
This commit is contained in:
Torsten Grote
2019-06-17 10:09:54 -03:00
parent 249e1e28fe
commit c73801c7e8
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
View File

@@ -4,6 +4,7 @@ import android.arch.lifecycle.ViewModelProvider;
import android.arch.lifecycle.ViewModelProviders; import android.arch.lifecycle.ViewModelProviders;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
@@ -15,6 +16,7 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
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;
import org.briarproject.briar.android.util.BriarSnackbarBuilder;
import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.view.BriarRecyclerView;
import java.util.Collection; import java.util.Collection;
@@ -22,6 +24,7 @@ import java.util.Collection;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
import static org.briarproject.bramble.api.contact.PendingContactState.FAILED; import static org.briarproject.bramble.api.contact.PendingContactState.FAILED;
import static org.briarproject.briar.android.contact.add.remote.PendingContactItem.POLL_DURATION_MS; import static org.briarproject.briar.android.contact.add.remote.PendingContactItem.POLL_DURATION_MS;
@@ -36,6 +39,7 @@ public class PendingContactListActivity extends BriarActivity
private PendingContactListViewModel viewModel; private PendingContactListViewModel viewModel;
private PendingContactListAdapter adapter; private PendingContactListAdapter adapter;
private BriarRecyclerView list; private BriarRecyclerView list;
private Snackbar offlineSnackbar;
@Override @Override
public void injectActivity(ActivityComponent component) { public void injectActivity(ActivityComponent component) {
@@ -58,6 +62,8 @@ public class PendingContactListActivity extends BriarActivity
viewModel.onCreate(); viewModel.onCreate();
viewModel.getPendingContacts() viewModel.getPendingContacts()
.observe(this, this::onPendingContactsChanged); .observe(this, this::onPendingContactsChanged);
viewModel.getHasInternetConnection()
.observe(this, this::onInternetConnectionChanged);
adapter = new PendingContactListAdapter(this, this, adapter = new PendingContactListAdapter(this, this,
PendingContactItem.class); PendingContactItem.class);
@@ -66,6 +72,10 @@ public class PendingContactListActivity extends BriarActivity
list.setLayoutManager(new LinearLayoutManager(this)); list.setLayoutManager(new LinearLayoutManager(this));
list.setAdapter(adapter); list.setAdapter(adapter);
list.showProgressBar(); list.showProgressBar();
offlineSnackbar = new BriarSnackbarBuilder()
.setBackgroundColor(R.color.briar_red)
.make(list, R.string.offline_state, LENGTH_INDEFINITE);
} }
@Override @Override
@@ -130,4 +140,9 @@ public class PendingContactListActivity extends BriarActivity
} }
} }
private void onInternetConnectionChanged(boolean online) {
if (online) offlineSnackbar.dismiss();
else offlineSnackbar.show();
}
} }

14
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
View File

@@ -31,6 +31,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.contact.PendingContactState.OFFLINE;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault @NotNullByDefault
@@ -48,6 +49,8 @@ public class PendingContactListViewModel extends AndroidViewModel
private final MutableLiveData<Collection<PendingContactItem>> private final MutableLiveData<Collection<PendingContactItem>>
pendingContacts = new MutableLiveData<>(); pendingContacts = new MutableLiveData<>();
private final MutableLiveData<Boolean> hasInternetConnection =
new MutableLiveData<>();
@Inject @Inject
PendingContactListViewModel(Application application, PendingContactListViewModel(Application application,
@@ -88,13 +91,16 @@ public class PendingContactListViewModel extends AndroidViewModel
Collection<Pair<PendingContact, PendingContactState>> pairs = Collection<Pair<PendingContact, PendingContactState>> pairs =
contactManager.getPendingContacts(); contactManager.getPendingContacts();
List<PendingContactItem> items = new ArrayList<>(pairs.size()); List<PendingContactItem> items = new ArrayList<>(pairs.size());
boolean online = false;
for (Pair<PendingContact, PendingContactState> pair : pairs) { for (Pair<PendingContact, PendingContactState> pair : pairs) {
PendingContact p = pair.getFirst(); PendingContact p = pair.getFirst();
PendingContactState state = pair.getSecond();
long lastPoll = rendezvousPoller.getLastPollTime(p.getId()); long lastPoll = rendezvousPoller.getLastPollTime(p.getId());
items.add(new PendingContactItem(p, pair.getSecond(), items.add(new PendingContactItem(p, state, lastPoll));
lastPoll)); online = online || state != OFFLINE;
} }
pendingContacts.postValue(items); pendingContacts.postValue(items);
hasInternetConnection.postValue(online);
} catch (DbException e) { } catch (DbException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
} }
@@ -115,4 +121,8 @@ public class PendingContactListViewModel extends AndroidViewModel
}); });
} }
LiveData<Boolean> getHasInternetConnection() {
return hasInternetConnection;
}
} }