Skip to content

Commit c6679ed

Browse files
ujjwalagrawal17Vivek Maskara
authored andcommitted
Improvements in Notification Activity (commons-app#1374)
* Improvements in Notification Activity * Update NotificationActivity.java
1 parent a927a80 commit c6679ed

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.content.Intent;
77
import android.net.Uri;
88
import android.os.Bundle;
9+
import android.support.design.widget.Snackbar;
910
import android.support.v7.widget.DividerItemDecoration;
1011
import android.support.v7.widget.LinearLayoutManager;
1112
import android.support.v7.widget.RecyclerView;
@@ -15,6 +16,7 @@
1516

1617
import com.pedrogomez.renderers.RVRendererAdapter;
1718

19+
import java.lang.ref.WeakReference;
1820
import java.util.Collections;
1921
import java.util.List;
2022

@@ -25,6 +27,7 @@
2527
import fr.free.nrw.commons.R;
2628
import fr.free.nrw.commons.Utils;
2729
import fr.free.nrw.commons.theme.NavigationBaseActivity;
30+
import fr.free.nrw.commons.utils.NetworkUtils;
2831
import fr.free.nrw.commons.utils.ViewUtil;
2932
import io.reactivex.Observable;
3033
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -62,9 +65,23 @@ private void initListView() {
6265
recyclerView.setLayoutManager(new LinearLayoutManager(this));
6366
DividerItemDecoration itemDecor = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
6467
recyclerView.addItemDecoration(itemDecor);
65-
addNotifications();
68+
refresh();
6669
}
6770

71+
private void refresh() {
72+
if (!NetworkUtils.isInternetConnectionEstablished(this)) {
73+
progressBar.setVisibility(View.GONE);
74+
Snackbar.make(relativeLayout , R.string.no_internet, Snackbar.LENGTH_INDEFINITE)
75+
.setAction(R.string.retry, view -> {
76+
refresh();
77+
}).show();
78+
}else {
79+
progressBar.setVisibility(View.VISIBLE);
80+
addNotifications();
81+
}
82+
}
83+
84+
6885
@SuppressLint("CheckResult")
6986
private void addNotifications() {
7087
Timber.d("Add notifications");
@@ -124,4 +141,4 @@ private void initializeAndSetNotificationList(List<Notification> notificationLis
124141
.commit();
125142
mNotificationWorkerFragment.setNotificationList(notificationList);
126143
}
127-
}
144+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,5 +267,6 @@
267267
<string name="about_translate_message">Select the language that you would like to submit translations for</string>
268268
<string name="about_translate_proceed">Proceed</string>
269269
<string name="about_translate_cancel">Cancel</string>
270+
<string name="retry">Retry</string>
270271

271272
</resources>

0 commit comments

Comments
 (0)