Merge remote-tracking branch 'refs/remotes/origin/2.7.x-release'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v2.7.2
+- Modified subtext for "automatically get current location" setting to emphasize that it will reveal user's location
+
 ## v2.7.1
 - Fixed UI and permission issues with Nearby
 - Fixed issue with My Recent Uploads being empty

app/build.gradle

@@ -92,8 +92,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 84
+        versionCode 85
-        versionName '2.7.1'
+        versionName '2.7.2'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion project.minSdkVersion

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

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"));

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>