Merge branch 'master' into login-screen-improvement

Author: psh

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

@@ -147,10 +147,10 @@ public void onCreate() {
      * @return Account|null
      */
     public Account getCurrentAccount() {
-        if(currentAccount == null) {
+        if (currentAccount == null) {
             AccountManager accountManager = AccountManager.get(this);
             Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
-            if(allAccounts.length != 0) {
+            if (allAccounts.length != 0) {
                 currentAccount = allAccounts[0];
             }
         }
@@ -161,7 +161,7 @@ public Boolean revalidateAuthToken() {
         AccountManager accountManager = AccountManager.get(this);
         Account curAccount = getCurrentAccount();
 
-        if(curAccount == null) {
+        if (curAccount == null) {
             return false; // This should never happen
         }
 
@@ -224,11 +224,13 @@ public void run(AccountManagerFuture<Boolean> accountManagerFuture) {
                 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 @@
 import android.support.annotation.Nullable;
 
 public class License {
-    String key;
-    String template;
-    String url;
-    String name;
+    private String key;
+    private String template;
+    private String url;
+    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 static String licenseUrlFor(String license) {
     public static boolean xmlFastForward(XmlPullParser parser, String namespace, String element) {
         try {
             while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                if (parser.getEventType() == XmlPullParser.START_TAG &&
-                        parser.getNamespace().equals(namespace) &&
-                        parser.getName().equals(element)) {
+                if (parser.getEventType() == XmlPullParser.START_TAG
+                        && parser.getNamespace().equals(namespace)
+                        && parser.getName().equals(element)) {
                     // We found it!
                     return true;
                 }
@@ -267,7 +267,8 @@ public static String fixExtension(String title, String extension) {
             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 @@
 
 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 @@ protected void onCreate(Bundle savedInstanceState) {
 
         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/caching/CacheController.java

@@ -32,7 +32,7 @@ public void setQtPoint(double decLongitude, double decLatitude) {
     public void cacheCategory() {
         List<String> pointCatList = new ArrayList<>();
         if (MwVolleyApi.GpsCatExists.getGpsCatExists()) {
-             pointCatList.addAll(MwVolleyApi.getGpsCat());
+            pointCatList.addAll(MwVolleyApi.getGpsCat());
             Timber.d("Categories being cached: %s", pointCatList);
         } else {
             Timber.d("No categories found, so no categories cached");

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

@@ -197,7 +197,7 @@ private void updateCategoryList(String filter) {
                 .concatWith(
                         searchAll(filter)
                                 .mergeWith(searchCategories(filter))
-                                .concatWith( TextUtils.isEmpty(filter)
+                                .concatWith(TextUtils.isEmpty(filter)
                                         ? defaultCategories() : Observable.empty())
                 )
                 .filter(categoryItem -> !containsYear(categoryItem.getName()))

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

@@ -142,11 +142,13 @@ public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
     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
+        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
         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 int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
     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
-        should be fine. So only issues are those that pass in via concating.
+        Even then, we should make sure to sanitize all user input appropriately.
+        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

@@ -27,7 +27,7 @@ public ModifierSequence(Uri mediaUri) {
     public ModifierSequence(Uri mediaUri, JSONObject data) {
         this(mediaUri);
         JSONArray modifiersJSON = data.optJSONArray("modifiers");
-        for(int i=0; i< modifiersJSON.length(); i++) {
+        for (int i=0; i< modifiersJSON.length(); i++) {
             modifiers.add(PageModifier.fromJSON(modifiersJSON.optJSONObject(i)));
         }
     }
@@ -41,7 +41,7 @@ public void queueModifier(PageModifier modifier) {
     }
 
     public String executeModifications(String pageName, String pageContents) {
-        for(PageModifier modifier: modifiers) {
+        for (PageModifier modifier: modifiers) {
             pageContents = modifier.doModification(pageName,  pageContents);
         }
         return pageContents;
@@ -60,7 +60,7 @@ public JSONObject toJSON() {
         JSONObject data = new JSONObject();
         try {
             JSONArray modifiersJSON = new JSONArray();
-            for(PageModifier modifier: modifiers) {
+            for (PageModifier modifier: modifiers) {
                 modifiersJSON.put(modifier.toJSON());
             }
             data.put("modifiers", modifiersJSON);
@@ -81,7 +81,8 @@ public static ModifierSequence fromCursor(Cursor cursor) {
         // 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);
         }