Added retry button to connectivitySnackbar.

Author: nitish1211

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

@@ -156,6 +156,7 @@ public class ZulipActivity extends BaseActivity implements
     final int allPeopleId = -1;
     public MessageListFragment currentList;
     public CommonProgressDialog commonProgressDialog;
+    private Snackbar connectivitySnackbar;
     FloatingActionButton fab;
     NarrowFilter narrowFilter;
     String prevId = null;
@@ -1980,7 +1981,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (networkStatus.equals(Constants.STATUS_CONNECTED)||networkStatus.equals(Constants.STATUS_CONNECTING)) {
+        if (networkStatus.equals(Constants.STATUS_CONNECTED) || networkStatus.equals(Constants.STATUS_CONNECTING)) {
             menu.findItem(R.id.refresh).setEnabled(true);
         } else {
             //Disabling the refresh button
@@ -2381,21 +2382,33 @@ public void showConnectivitySnackBar(final String networkState) {
             public void handleMessage(android.os.Message msg) {
                 if (networkState.equals(Constants.STATUS_CONNECTING)) {
                     networkStatus = Constants.STATUS_CONNECTING;
-                    Snackbar.make(coordinatorLayout, R.string.connecting, Snackbar.LENGTH_INDEFINITE).show();
+                    connectivitySnackbar = Snackbar.make(coordinatorLayout, R.string.connecting, Snackbar.LENGTH_INDEFINITE);
+                    connectivitySnackbar.show();
 
                 } else if (networkState.equals(Constants.STATUS_CONNECTED)) {
+                    if (connectivitySnackbar != null) {
+                        connectivitySnackbar.dismiss();
+                    }
                     //Starts a network request only when there is an active network connection
                     startRequests();
                     networkStatus = Constants.STATUS_CONNECTED;
-                    Snackbar.make(coordinatorLayout, R.string.connection_established, Snackbar.LENGTH_SHORT).show();
                 } else {
                     displayChatBox(false);
                     displayFAB(true);
                     //Displays old offline messages
-                    if(!networkStatus.equals(Constants.STATUS_CONNECTED))
+                    if (!networkStatus.equals(Constants.STATUS_CONNECTED))
                         onReadyToDisplay(true);
                     networkStatus = Constants.STATUS_NOT_CONNECTED;
-                    Snackbar.make(coordinatorLayout, R.string.no_connection, Snackbar.LENGTH_INDEFINITE).show();
+                    connectivitySnackbar = Snackbar.make(coordinatorLayout, R.string.no_connection, Snackbar.LENGTH_INDEFINITE);
+                    connectivitySnackbar.setAction("RETRY", new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            showConnectivitySnackBar(Constants.STATUS_CONNECTING);
+                            startRequests();
+                        }
+                    });
+                    connectivitySnackbar.setActionTextColor(getResources().getColor(R.color.top_snackbar_show_button_text_color));
+                    connectivitySnackbar.show();
                 }
                 Log.d("NetworkStatus", networkState);
                 super.handleMessage(msg);

app/src/main/java/com/zulip/android/networking/AsyncGetEvents.java

@@ -287,9 +287,8 @@ public void run() {
                         if (body.getEvents().size() > 0) {
                             this.processEvents(body);
                             app.setLastEventId(body.getEvents().get(body.getEvents().size() - 1).getId());
-                            //Shows connected status on receiving data
-                            if (failures > 0)
-                                mActivity.showConnectivitySnackBar(Constants.STATUS_CONNECTED);
+                            //Dismiss Snackbar on Connecting
+                            mActivity.showConnectivitySnackBar(Constants.STATUS_CONNECTED);
                             failures = 0;
                         }
 

app/src/main/res/values/strings.xml

@@ -156,7 +156,6 @@
     <string name="copy_message_fetch">Copying message to clipboard</string>
     <string name="copy_failed">Copying to clipboard failed</string>
     <string name="try_again_error_msg">Something went wrong, try again</string>
-    <string name="connection_established">Connection Established</string>
     <string name="no_connection">Waiting for Connection</string>
     <string name="connecting">Connecting ...</string>
 </resources>