Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1695-show-no-internet-snackbar-when-tor-disabled' into 'master'

Browse Source 
Show "No Internet" snackbar when Tor plugin is not active

Closes #1695

See merge request briar/briar!1222
This commit is contained in:
akwizgran
2020-02-11 17:28:05 +00:00
parent c4761c3bb2 c976dd02ae
commit 287be6aa3f
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ public class PendingContactListViewModel extends AndroidViewModel
Collection<Pair<PendingContact, PendingContactState>> pairs =
contactManager.getPendingContacts();
List<PendingContactItem> items = new ArrayList<>(pairs.size());
boolean online = items.isEmpty();
boolean online = pairs.isEmpty();
for (Pair<PendingContact, PendingContactState> pair : pairs) {
PendingContact p = pair.getFirst();
PendingContactState state = pair.getSecond();

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactViewHolder.java
View File

@@ -54,8 +54,6 @@ class PendingContactViewHolder extends ViewHolder {
status.setText(R.string.waiting_for_contact_to_come_online);
break;
case OFFLINE:
color = ContextCompat
.getColor(status.getContext(), R.color.briar_yellow);
status.setText("");
break;
case CONNECTING: