Merge pull request #1122 from noloman/bugfix/171

Fixing some lint issues for #171

Author: neslihanturan

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

@@ -31,7 +31,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         ButterKnife.bind(this);
 
-        String aboutText = getString(R.string.about_license, getString(R.string.trademarked_name));
+        String aboutText = getString(R.string.about_license);
         aboutLicenseText.setHtmlText(aboutText);
 
         versionText.setText(BuildConfig.VERSION_NAME);

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

@@ -32,7 +32,6 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;

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

@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.category;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;

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

@@ -93,10 +93,15 @@ void handleImagePicked(int requestCode, Intent data) {
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_GALLERY);
                 break;
             case SELECT_FROM_CAMERA:
-                shareIntent.setType("image/jpeg"); //FIXME: Find out appropriate mime type
+                //FIXME: Find out appropriate mime type
+                // AFAIK this is the right type for a JPEG image
+                // https://developer.android.com/training/sharing/send.html#send-binary-content
+                shareIntent.setType("image/jpeg");
                 shareIntent.putExtra(EXTRA_STREAM, lastGeneratedCaptureUri);
                 shareIntent.putExtra(EXTRA_SOURCE, SOURCE_CAMERA);
                 break;
+            default:
+                break;
         }
         Timber.i("Image selected");
         try {

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

@@ -86,7 +86,7 @@ public String getType(@NonNull Uri uri) {
     public Uri insert(@NonNull Uri uri, ContentValues contentValues) {
         int uriType = uriMatcher.match(uri);
         SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        long id = 0;
+        long id;
         switch (uriType) {
             case CONTRIBUTIONS:
                 id = sqlDB.insert(TABLE_NAME, null, contentValues);
@@ -158,7 +158,7 @@ public int update(@NonNull Uri uri, ContentValues contentValues, String selectio
          */
         int uriType = uriMatcher.match(uri);
         SQLiteDatabase sqlDB = dbOpenHelper.getWritableDatabase();
-        int rowsUpdated = 0;
+        int rowsUpdated;
         switch (uriType) {
             case CONTRIBUTIONS:
                 rowsUpdated = sqlDB.update(TABLE_NAME, contentValues, selection, selectionArgs);

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

@@ -20,6 +20,8 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import java.util.Arrays;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -45,8 +47,12 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
     @BindView(R.id.loadingContributionsProgressBar)
     ProgressBar progressBar;
 
-    @Inject @Named("prefs") SharedPreferences prefs;
-    @Inject @Named("default_preferences") SharedPreferences defaultPrefs;
+    @Inject
+    @Named("prefs")
+    SharedPreferences prefs;
+    @Inject
+    @Named("default_preferences")
+    SharedPreferences defaultPrefs;
 
     private ContributionController controller;
 
@@ -208,7 +214,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
                                            @NonNull int[] grantResults) {
         Timber.d("onRequestPermissionsResult: req code = " + " perm = "
-                + permissions + " grant =" + grantResults);
+                + Arrays.toString(permissions) + " grant =" + Arrays.toString(grantResults));
 
         switch (requestCode) {
             // 1 = Storage allowed when gallery selected

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

@@ -23,7 +23,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.LogEventResult;

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

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.di;
 
-import android.content.Context;
-
 import javax.inject.Singleton;
 
 import dagger.Component;
@@ -11,10 +9,7 @@
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.auth.LoginActivity;
-import fr.free.nrw.commons.category.CategoryContentProvider;
-import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
-import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
 import fr.free.nrw.commons.settings.SettingsFragment;
 

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java

@@ -14,9 +14,6 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import timber.log.Timber;
 
 public class LocationServiceManager implements LocationListener {
@@ -33,6 +30,7 @@ public class LocationServiceManager implements LocationListener {
 
     /**
      * Constructs a new instance of LocationServiceManager.
+     *
      * @param context the context
      */
     public LocationServiceManager(Context context) {
@@ -42,6 +40,7 @@ public LocationServiceManager(Context context) {
 
     /**
      * Returns the current status of the GPS provider.
+     *
      * @return true if the GPS provider is enabled
      */
     public boolean isProviderEnabled() {
@@ -50,6 +49,7 @@ public boolean isProviderEnabled() {
 
     /**
      * Returns whether the location permission is granted.
+     *
      * @return true if the location permission is granted
      */
     public boolean isLocationPermissionGranted() {
@@ -59,6 +59,7 @@ public boolean isLocationPermissionGranted() {
 
     /**
      * Requests the location permission to be granted.
+     *
      * @param activity the activity
      */
     public void requestPermissions(Activity activity) {
@@ -71,11 +72,9 @@ public void requestPermissions(Activity activity) {
     }
 
     public boolean isPermissionExplanationRequired(Activity activity) {
-        if (activity.isFinishing()) {
-            return false;
-        }
-        return ActivityCompat.shouldShowRequestPermissionRationale(activity,
-                Manifest.permission.ACCESS_FINE_LOCATION);
+        return !activity.isFinishing() &&
+                ActivityCompat.shouldShowRequestPermissionRationale(activity,
+                        Manifest.permission.ACCESS_FINE_LOCATION);
     }
 
     public LatLng getLastLocation() {
@@ -85,7 +84,8 @@ public LatLng getLastLocation() {
         return LatLng.from(lastLocation);
     }
 
-    /** Registers a LocationManager to listen for current location.
+    /**
+     * Registers a LocationManager to listen for current location.
      */
     public void registerLocationManager() {
         if (!isLocationManagerRegistered)
@@ -95,6 +95,7 @@ public void registerLocationManager() {
 
     /**
      * Requests location updates from the specified provider.
+     *
      * @param locationProvider the location provider
      * @return true if successful
      */
@@ -116,7 +117,8 @@ private boolean requestLocationUpdatesFromProvider(String locationProvider) {
 
     /**
      * Returns whether a given location is better than the current best location.
-     * @param location the location to be tested
+     *
+     * @param location            the location to be tested
      * @param currentBestLocation the current best location
      * @return true if the given location is better
      */
@@ -172,7 +174,8 @@ private boolean isSameProvider(String provider1, String provider2) {
         return provider1.equals(provider2);
     }
 
-    /** Unregisters location manager.
+    /**
+     * Unregisters location manager.
      */
     public void unregisterLocationManager() {
         isLocationManagerRegistered = false;
@@ -185,6 +188,7 @@ public void unregisterLocationManager() {
 
     /**
      * Adds a new listener to the list of location listeners.
+     *
      * @param listener the new listener
      */
     public void addLocationListener(LocationUpdateListener listener) {
@@ -195,6 +199,7 @@ public void addLocationListener(LocationUpdateListener listener) {
 
     /**
      * Removes a listener from the list of location listeners.
+     *
      * @param listener the listener to be removed
      */
     public void removeLocationListener(LocationUpdateListener listener) {