Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 23160b6

Browse files
committed
Show messages even when Offline.
1 parent 2a98b47 commit 23160b6

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
package com.zulip.android.activities;
22

33
import android.Manifest;
4-
import java.sql.SQLException;
5-
import java.util.Arrays;
6-
import java.util.HashMap;
7-
import java.util.List;
8-
import java.util.Locale;
9-
import java.util.concurrent.Callable;
10-
import java.util.ArrayList;
11-
124
import android.animation.Animator;
135
import android.annotation.SuppressLint;
146
import android.annotation.TargetApi;
@@ -99,9 +91,9 @@
9991
import com.zulip.android.models.Emoji;
10092
import com.zulip.android.models.Message;
10193
import com.zulip.android.models.MessageType;
94+
import com.zulip.android.models.PeopleDrawerList;
10295
import com.zulip.android.models.Person;
10396
import com.zulip.android.models.Presence;
104-
import com.zulip.android.models.PeopleDrawerList;
10597
import com.zulip.android.models.Stream;
10698
import com.zulip.android.networking.AsyncGetEvents;
10799
import com.zulip.android.networking.AsyncSend;
@@ -127,9 +119,16 @@
127119

128120
import java.io.File;
129121
import java.io.IOException;
122+
import java.sql.SQLException;
130123
import java.text.SimpleDateFormat;
124+
import java.util.ArrayList;
125+
import java.util.Arrays;
131126
import java.util.Calendar;
132127
import java.util.Date;
128+
import java.util.HashMap;
129+
import java.util.List;
130+
import java.util.Locale;
131+
import java.util.concurrent.Callable;
133132

134133
import okhttp3.MediaType;
135134
import okhttp3.MultipartBody;
@@ -779,6 +778,7 @@ public void afterTextChanged(Editable s) {
779778

780779
/**
781780
* Filter'keyWords people drawer according to name
781+
*
782782
* @param keyWords removes names which don't contain keyWords
783783
*/
784784
private void filterPeopleDrawer(String keyWords) {
@@ -804,6 +804,7 @@ private void filterPeopleDrawer(String keyWords) {
804804

805805
/**
806806
* Refreshes recyclerView of people drawer
807+
*
807808
* @throws SQLException
808809
*/
809810
public void refreshPeopleDrawer() throws SQLException {
@@ -846,6 +847,7 @@ public void refreshPeopleDrawer() throws SQLException {
846847

847848
/**
848849
* Combine list of recent private messages persons and persons with no recent messages
850+
*
849851
* @param drawerLists persons with whom no recent messages
850852
*/
851853
private void combineList(List<PeopleDrawerList> drawerLists) {
@@ -2428,6 +2430,7 @@ public MessageListFragment getCurrentMessageList() {
24282430
public enum Flag {
24292431
RESET_DATABASE,
24302432
}
2433+
24312434
/**
24322435
* This function shows the snackbar stating the connectivity status of the device and also changes the behaviour of the
24332436
* fab.
@@ -2449,6 +2452,9 @@ public void handleMessage(android.os.Message msg) {
24492452
} else {
24502453
displayChatBox(false);
24512454
displayFAB(true);
2455+
//Displays old offline messages
2456+
if (!networkStatus.equals(Constants.STATUS_CONNECTED))
2457+
onReadyToDisplay(true);
24522458
networkStatus = Constants.STATUS_NOT_CONNECTED;
24532459
Snackbar.make(coordinatorLayout, R.string.no_connection, Snackbar.LENGTH_INDEFINITE).show();
24542460
}

0 commit comments

Comments
 (0)