Merge branch 'master' into login-screen-improvement

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

@@ -224,11 +224,13 @@ public class CommonsApplication extends Application {
                 if (getIndex() == allAccounts.length) {
                     Timber.d("All accounts have been removed");
                     //TODO: fix preference manager
-                    PreferenceManager.getDefaultSharedPreferences(getInstance()).edit().clear().commit();
+                    PreferenceManager.getDefaultSharedPreferences(getInstance())
+                            .edit().clear().commit();
                     SharedPreferences preferences = context
                             .getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE);
                     preferences.edit().clear().commit();
-                    context.getSharedPreferences("prefs", Context.MODE_PRIVATE).edit().clear().commit();
+                    context.getSharedPreferences("prefs", Context.MODE_PRIVATE)
+                            .edit().clear().commit();
                     preferences.edit().putBoolean("firstrun", false).apply();
                     updateAllDatabases();
                     currentAccount = null;

app/src/main/java/fr/free/nrw/commons/License.java

@@ -3,10 +3,10 @@ package fr.free.nrw.commons;
 import android.support.annotation.Nullable;
 
 public class License {
-    String key;
+    private String key;
-    String template;
+    private String template;
-    String url;
+    private String url;
-    String name;
+    private String name;
 
     public License(String key, String template, String url, String name) {
         if (key == null) {

app/src/main/java/fr/free/nrw/commons/Utils.java

@@ -242,9 +242,9 @@ public class Utils {
     public static boolean xmlFastForward(XmlPullParser parser, String namespace, String element) {
         try {
             while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                if (parser.getEventType() == XmlPullParser.START_TAG &&
+                if (parser.getEventType() == XmlPullParser.START_TAG
-                        parser.getNamespace().equals(namespace) &&
+                        && parser.getNamespace().equals(namespace)
-                        parser.getName().equals(element)) {
+                        && parser.getName().equals(element)) {
                     // We found it!
                     return true;
                 }
@@ -267,7 +267,8 @@ public class Utils {
             extension = "jpg";
         }
         title = jpegPattern.matcher(title).replaceFirst(".jpg");
-        if (extension != null && !title.toLowerCase(Locale.getDefault()).endsWith("." + extension.toLowerCase(Locale.ENGLISH))) {
+        if (extension != null && !title.toLowerCase(Locale.getDefault())
+                .endsWith("." + extension.toLowerCase(Locale.ENGLISH))) {
             title += "." + extension;
         }
         return title;

app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java

@@ -14,7 +14,7 @@ import timber.log.Timber;
 
 public abstract class AuthenticatedActivity extends NavigationBaseActivity {
 
-    String accountType;
+    private String accountType;
     CommonsApplication app;
 
     private String authCookie;

app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java

@@ -25,7 +25,8 @@ public class SignupActivity extends BaseActivity {
 
         webView.setWebViewClient(new MyWebViewClient());
         WebSettings webSettings = webView.getSettings();
-        //Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can trust Wikimedia's site... right?
+        /*Needed to refresh Captcha. Might introduce XSS vulnerabilities, but we can
+         trust Wikimedia's site... right?*/
         webSettings.setJavaScriptEnabled(true);
 
         webView.loadUrl(BuildConfig.SIGNUP_LANDING_URL);

app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java

@@ -142,11 +142,13 @@ public class CategoryContentProvider extends ContentProvider {
     public int update(@NonNull Uri uri, ContentValues contentValues, String selection,
                       String[] selectionArgs) {
         /*
-        SQL Injection warnings: First, note that we're not exposing this to the outside world (exported="false")
+        SQL Injection warnings: First, note that we're not exposing this to the
-        Even then, we should make sure to sanitize all user input appropriately. Input that passes through ContentValues
+        outside world (exported="false"). Even then, we should make sure to sanitize
+        all user input appropriately. Input that passes through ContentValues
         should be fine. So only issues are those that pass in via concating.
 
-        In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise.
+        In here, the only concat created argument is for id. It is cast to an int,
+        and will error out otherwise.
          */
         int uriType = uriMatcher.match(uri);
         SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();

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

@@ -154,10 +154,12 @@ public class ContributionsContentProvider extends ContentProvider {
     public int update(@NonNull Uri uri, ContentValues contentValues, String selection, String[] selectionArgs) {
         /*
         SQL Injection warnings: First, note that we're not exposing this to the outside world (exported="false")
-        Even then, we should make sure to sanitize all user input appropriately. Input that passes through ContentValues
+        Even then, we should make sure to sanitize all user input appropriately.
-        should be fine. So only issues are those that pass in via concating.
+        Input that passes through ContentValuesshould be fine. So only issues are those that pass
+        in via concating.
 
-        In here, the only concat created argument is for id. It is cast to an int, and will error out otherwise.
+        In here, the only concat created argument is for id. It is cast to an int, and will
+        error out otherwise.
          */
         int uriType = uriMatcher.match(uri);
         CommonsApplication app = (CommonsApplication) getContext().getApplicationContext();

app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java

@@ -81,7 +81,8 @@ public class ModifierSequence {
         // Hardcoding column positions!
         ModifierSequence ms = null;
         try {
-            ms = new ModifierSequence(Uri.parse(cursor.getString(1)), new JSONObject(cursor.getString(2)));
+            ms = new ModifierSequence(Uri.parse(cursor.getString(1)),
+                new JSONObject(cursor.getString(2)));
         } catch (JSONException e) {
             throw new RuntimeException(e);
         }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -3,12 +3,14 @@ package fr.free.nrw.commons.nearby;
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
@@ -42,28 +44,46 @@ public class NearbyActivity extends NavigationBaseActivity {
 
     @BindView(R.id.progressBar)
     ProgressBar progressBar;
-    private boolean isMapViewActive = false;
     private static final int LOCATION_REQUEST = 1;
+    private static final String MAP_LAST_USED_PREFERENCE = "mapLastUsed";
 
     private LocationServiceManager locationManager;
     private LatLng curLatLang;
     private Bundle bundle;
     private NearbyAsyncTask nearbyAsyncTask;
+    private SharedPreferences sharedPreferences;
+    private NearbyActivityMode viewMode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         setContentView(R.layout.activity_nearby);
         ButterKnife.bind(this);
         checkLocationPermission();
         bundle = new Bundle();
         initDrawer();
+        initViewState();
+    }
+
+    private void initViewState() {
+        if (sharedPreferences.getBoolean(MAP_LAST_USED_PREFERENCE, false)) {
+            viewMode = NearbyActivityMode.MAP;
+        } else {
+            viewMode = NearbyActivityMode.LIST;
+        }
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.menu_nearby, menu);
+
+        if (viewMode.isMap()) {
+            MenuItem item = menu.findItem(R.id.action_toggle_view);
+            item.setIcon(viewMode.getIcon());
+        }
+
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -74,13 +94,10 @@ public class NearbyActivity extends NavigationBaseActivity {
             case R.id.action_refresh:
                 refreshView();
                 return true;
-            case R.id.action_map:
+            case R.id.action_toggle_view:
-                showMapView();
+                viewMode = viewMode.toggle();
-                if (isMapViewActive) {
+                item.setIcon(viewMode.getIcon());
-                    item.setIcon(R.drawable.ic_list_white_24dp);
+                toggleView();
-                } else {
-                    item.setIcon(R.drawable.ic_map_white_24dp);
-                }
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -158,15 +175,30 @@ public class NearbyActivity extends NavigationBaseActivity {
                     if (progressBar != null) {
                         progressBar.setVisibility(View.GONE);
                     }
-                    FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+
-                    Fragment noPermissionsFragment = new NoPermissionsFragment();
+                    showLocationPermissionDeniedErrorDialog();
-                    fragmentTransaction.replace(R.id.container, noPermissionsFragment);
-                    fragmentTransaction.commit();
                 }
             }
         }
     }
 
+    private void showLocationPermissionDeniedErrorDialog() {
+        new AlertDialog.Builder(this)
+                .setMessage(R.string.nearby_needs_permissions)
+                .setCancelable(false)
+                .setPositiveButton(R.string.give_permission, (dialog, which) -> {
+                    //will ask for the location permission again
+                    checkLocationPermission();
+                })
+                .setNegativeButton(R.string.cancel, (dialog, which) -> {
+                    //dismiss dialog and finish activity
+                    dialog.cancel();
+                    finish();
+                })
+                .create()
+                .show();
+    }
+
     private void checkGps() {
         LocationManager manager = (LocationManager) getSystemService(LOCATION_SERVICE);
         if (!manager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
@@ -198,20 +230,16 @@ public class NearbyActivity extends NavigationBaseActivity {
         }
     }
 
-    private void showMapView() {
+    private void toggleView() {
         if (nearbyAsyncTask != null) {
-            if (!isMapViewActive) {
-                isMapViewActive = true;
             if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
+                if (viewMode.isMap()) {
                     setMapFragment();
-                }
-
                 } else {
-                isMapViewActive = false;
-                if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) {
                     setListFragment();
                 }
             }
+            sharedPreferences.edit().putBoolean(MAP_LAST_USED_PREFERENCE, viewMode.isMap()).apply();
         }
     }
 
@@ -287,7 +315,7 @@ public class NearbyActivity extends NavigationBaseActivity {
             bundle.putString("CurLatLng", gsonCurLatLng);
 
             // Begin the transaction
-            if (isMapViewActive) {
+            if (viewMode.isMap()) {
                 setMapFragment();
             } else {
                 setListFragment();

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivityMode.java

@@ -0,0 +1,30 @@
+package fr.free.nrw.commons.nearby;
+
+import android.support.annotation.DrawableRes;
+
+import fr.free.nrw.commons.R;
+
+enum NearbyActivityMode {
+    MAP(R.drawable.ic_list_white_24dp),
+    LIST(R.drawable.ic_map_white_24dp);
+
+    @DrawableRes
+    private final int icon;
+
+    NearbyActivityMode(int icon) {
+        this.icon = icon;
+    }
+
+    @DrawableRes
+    public int getIcon() {
+        return icon;
+    }
+
+    public NearbyActivityMode toggle() {
+        return isMap() ? LIST : MAP;
+    }
+
+    public boolean isMap() {
+        return MAP.equals(this);
+    }
+}

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

@@ -86,7 +86,8 @@ public class SingleUploadFragment extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+           Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_single_upload, container, false);
         ButterKnife.bind(this, rootView);
 

app/src/main/res/menu/menu_nearby.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"      tools:context=".MainActivity">
 
     <item
-        android:id="@+id/action_map"
+        android:id="@+id/action_toggle_view"
         android:title="@string/refresh_button"
         android:icon="@drawable/ic_map_white_24dp"
         android:orderInCategory="1"

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

@@ -54,7 +54,10 @@
   <string name="gps_disabled">आपके डिवाइस में जीपीएस अक्षम है। क्या आप इसे सक्षम करना चाहेंगे?</string>
   <string name="enable_gps">जीपीएस सक्षम करें</string>
   <string name="contributions_subtitle_zero">अभी तक कोई अपलोड नहीं</string>
-  <string name="contributions_subtitle" formatted="false">{{PLURAL | शून्य = @ स्ट्रिंग / योगदान_उपशीर्षक_शुन्य | एक =% d अपलोड |% d अपलोड्स}}</string>
+  <plurals name="contributions_subtitle">
+    <item quantity="one">%d अपलोड</item>
+    <item quantity="other">%d अपलोड्स</item>
+  </plurals>
   <plurals name="starting_multiple_uploads">
     <item quantity="one">%d अपलोड शुरू</item>
     <item quantity="other">%d अपलोड शुरू</item>

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

@@ -77,10 +77,10 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="title_activity_settings">Settings</string>
   <string name="title_activity_signup">Sign Up</string>
   <string name="menu_about">About</string>
-  <string name="about_license">Open Source software released under the &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache License v2&lt;/a&gt;. %1$s and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation.</string>
+  <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
   <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Source&lt;/a&gt; and &lt;a href=\"https://commons-app.github.io/\"&gt;website&lt;/a&gt; on GitHub. Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\"&gt;Privacy policy&lt;/a&gt;</string>
+  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Privacy policy&lt;/a&gt;</string>
   <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Credits&lt;/a&gt;</string>
   <string name="title_activity_about">About</string>
   <string name="menu_feedback">Send Feedback (via Email)</string>
@@ -204,6 +204,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="error_while_cache">Error while caching pictures</string>
   <string name="title_info">A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension</string>
   <string name="description_info">Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual.</string>
+  <string name="give_permission">Give permission</string>
   <string name="use_external_storage">Use external storage</string>
   <string name="use_external_storage_summary">Save pictures taken with the in-app camera on your device</string>
     <string name="login_to_your_account">Login to your account</string>

design/Commons-logo.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1024" height="1376" viewBox="-305 -516 610 820">
+<title>Wikimedia Commons Logo</title>
+<defs>
+	<clipPath id="c"><circle r="298"/></clipPath>
+</defs>
+<circle r="100" fill="#900"/>
+<g fill="#069">
+	<g id="arrow" clip-path="url(#c)">
+		<path d="m-11 180v118h22v-118"/>
+		<path d="m-43 185l43-75 43 75"/>
+	</g>
+	<g id="arrows3">
+		<use xlink:href="#arrow" transform="rotate(45)"/>
+		<use xlink:href="#arrow" transform="rotate(90)"/>
+		<use xlink:href="#arrow" transform="rotate(135)"/>
+	</g>
+	<use xlink:href="#arrows3" transform="scale(-1 1)"/>
+	<path id="blue_path" transform="rotate(-45)" stroke="#069" stroke-width="84" fill="none" d="M 0,-256 A 256 256 0 1 0 256,0 C 256,-100 155,-150 250,-275"/>
+	<path id="arrow_top" d="m-23-515s-36 135-80 185 116-62 170-5-90-180-90-180z"/>
+</g>
+</svg>