Skip to content

Commit 1adb052

Browse files
authored
Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails" (#1609)
* Revert "Modify allow_gps_summary string (#1608)" This reverts commit 3b6c94c. * Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails" This reverts commit 5aba745.
1 parent 3b6c94c commit 1adb052

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ protected void onCreate(Bundle savedInstanceState) {
144144
if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
145145
setUploadCount();
146146
}
147+
147148
}
148149

149150
@Override

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java

-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.os.Bundle;
88
import android.support.annotation.NonNull;
99
import android.support.v4.content.ContextCompat;
10-
import android.support.v4.widget.SwipeRefreshLayout;
1110
import android.support.v7.app.AlertDialog;
1211
import android.view.LayoutInflater;
1312
import android.view.Menu;
@@ -48,8 +47,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
4847
TextView waitingMessage;
4948
@BindView(R.id.loadingContributionsProgressBar)
5049
ProgressBar progressBar;
51-
@BindView(R.id.swipeRefreshLayout)
52-
SwipeRefreshLayout swipeRefreshLayout;
5350

5451
@Inject
5552
@Named("prefs")
@@ -67,13 +64,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
6764
ButterKnife.bind(this, v);
6865

6966
contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
70-
swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
71-
@Override
72-
public void onRefresh() {
73-
((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged();
74-
swipeRefreshLayout.setRefreshing(false);
75-
}
76-
});
7767
if (savedInstanceState != null) {
7868
Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position"));
7969
contributionsList.setSelection(savedInstanceState.getInt("grid-position"));

app/src/main/res/layout/fragment_contributions.xml

+1-6
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
android:id="@+id/loadingContributionsProgressBar"
2525
/>
2626

27-
<android.support.v4.widget.SwipeRefreshLayout
28-
android:id="@+id/swipeRefreshLayout"
29-
android:layout_width="match_parent"
30-
android:layout_height="match_parent">
31-
3227
<GridView
3328
android:id="@+id/contributionsList"
3429
android:layout_height="match_parent"
@@ -40,5 +35,5 @@
4035
android:fadingEdge="none"
4136
android:fastScrollEnabled="true"
4237
/>
43-
</android.support.v4.widget.SwipeRefreshLayout>
38+
4439
</RelativeLayout>

0 commit comments

Comments
 (0)