From 3b6c94c8d62e846faf83564a76a23b0b134cfbbb Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Mon, 11 Jun 2018 16:47:01 +1000
Subject: [PATCH 1/2] Modify allow_gps_summary string (#1608)

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 810ddc65a..7a0d89350 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,7 @@
   <string name="preference_license">Default License</string>
   <string name="use_previous">Use previous title/description</string>
   <string name="allow_gps">Automatically get current location</string>
-  <string name="allow_gps_summary">Retrieve current location to offer category suggestions if image is not geotagged</string>
+  <string name="allow_gps_summary">Retrieves current location if image is not geotagged, and geotags image with it. Warning: This will reveal your current location.</string>
   <string name="preference_theme">Night mode</string>
   <string name="preference_theme_summary">Use dark theme</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>

From 1adb052705f397d6c0cced60c357e0009e4074b2 Mon Sep 17 00:00:00 2001
From: Josephine Lim <josephinelim86@gmail.com>
Date: Mon, 11 Jun 2018 16:53:23 +1000
Subject: [PATCH 2/2] Revert "Fix issue #1332 : Contribution Image auto/manual
 refresh if fetching fails" (#1609)

* Revert "Modify allow_gps_summary string (#1608)"

This reverts commit 3b6c94c8d62e846faf83564a76a23b0b134cfbbb.

* Revert "Fix issue #1332 : Contribution Image auto/manual refresh if fetching fails"

This reverts commit 5aba7459bdd71082410b3bb4cf9977d95ebc584e.
---
 .../commons/contributions/ContributionsActivity.java   |  1 +
 .../contributions/ContributionsListFragment.java       | 10 ----------
 app/src/main/res/layout/fragment_contributions.xml     |  7 +------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index 312839a24..ad6cff606 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -144,6 +144,7 @@ public  class       ContributionsActivity
         if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){
             setUploadCount();
         }
+
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 2b6c56c43..ff400a8dd 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -7,7 +7,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -48,8 +47,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
     TextView waitingMessage;
     @BindView(R.id.loadingContributionsProgressBar)
     ProgressBar progressBar;
-    @BindView(R.id.swipeRefreshLayout)
-    SwipeRefreshLayout swipeRefreshLayout;
 
     @Inject
     @Named("prefs")
@@ -67,13 +64,6 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
         ButterKnife.bind(this, v);
 
         contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
-        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                ((ContributionsListAdapter)contributionsList.getAdapter()).notifyDataSetChanged();
-                swipeRefreshLayout.setRefreshing(false);
-            }
-        });
         if (savedInstanceState != null) {
             Timber.d("Scrolling to %d", savedInstanceState.getInt("grid-position"));
             contributionsList.setSelection(savedInstanceState.getInt("grid-position"));
diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml
index d089c7053..fa53d9721 100644
--- a/app/src/main/res/layout/fragment_contributions.xml
+++ b/app/src/main/res/layout/fragment_contributions.xml
@@ -24,11 +24,6 @@
         android:id="@+id/loadingContributionsProgressBar"
         />
 
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
     <GridView
         android:id="@+id/contributionsList"
         android:layout_height="match_parent"
@@ -40,5 +35,5 @@
         android:fadingEdge="none"
         android:fastScrollEnabled="true"
         />
-    </android.support.v4.widget.SwipeRefreshLayout>
+
 </RelativeLayout>
\ No newline at end of file