Merge branch 'master' into master

Author: misaochan

.travis.yml

@@ -33,8 +33,6 @@ after_success:
 after_failure:
   - echo '*** Connected Test Rsults ***'
   - w3m -dump ${TRAVIS_BUILD_DIR}/app/build/reports/androidTests/connected/*Test.html
-  - echo '*** Lint Results ***'
-  - cat ${TRAVIS_BUILD_DIR}/app/build/reports/lint-results.xml
 jdk:
   # - openjdk8 # not yet available
   - oraclejdk8

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Wikimedia Commons for Android
 
+## v2.5.0 beta
+- Added one-time popup for beta users to provide feedback on IEG renewal proposal
+- Added link to Commons policies in ShareActivity
+- Various string fixes
+- Switched to using vector icons for map markers
+- Added filter for irrelevant categories
+- Fixed various crashes
+- Incremented target SDK to 25
+- Improved appearance of navigation drawer
+- Replaced proprietary app image in tutorial with one that isn't Telegram
+- Fixed camera issue with FileProvider
+- Added RxJava library, migrated to Java 8
+- Various code and continuous integration optimizations
+
 ## v2.4.2 beta
 - Added option to launch tutorial again from nav drawer
 - Added marker for current location in Nearby map

CREDITS

@@ -24,6 +24,8 @@ their contribution to the product.
 * Dmitry Brant
 * Adam Shorland
 * John Lubbock
+* Mikel Pascual
+* Jan Piotrowski
 
 3rd party open source libraries used:
 * Butterknife

app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'jacoco-android'
 apply from: 'quality.gradle'
 apply plugin: 'com.getkeepsafe.dexcount'
@@ -51,8 +52,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 73
-        versionName '2.4.2'
+        versionCode 74
+        versionName '2.5.0'
         minSdkVersion project.minSdkVersion
         targetSdkVersion project.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -75,6 +76,11 @@ android {
         abortOnError false
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     //FIXME: Temporary fix for https://github.com/commons-app/apps-android-commons/issues/709
     configurations.all {
         resolutionStrategy.force 'com.android.support:support-annotations:25.2.0'

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

@@ -11,6 +11,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
+import android.util.Log;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.stetho.Stetho;
@@ -139,6 +140,10 @@ public void onCreate() {
         System.setProperty("in.yuvi.http.fluent.PROGRESS_TRIGGER_THRESHOLD", "3.0");
 
         Fresco.initialize(this);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
+                CommonsApplication.getInstance());
+        // Increase counter by one, starts from 1
+        prefs.edit().putInt("app_start_counter", prefs.getInt("app_start_counter" ,0) + 1).commit();
 
         //For caching area -> categories
         cacheData  = new CacheController();
@@ -197,8 +202,8 @@ public void clearApplicationData(Context context) {
 
         AccountManager accountManager = AccountManager.get(this);
         Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
-        for (int index = 0; index < allAccounts.length; index++) {
-            accountManager.removeAccount(allAccounts[index], null, null);
+        for (Account allAccount : allAccounts) {
+            accountManager.removeAccount(allAccount, null, null);
         }
 
         //TODO: fix preference manager 

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

@@ -142,7 +142,7 @@ public void setLicense(String license) {
         return coordinates;
     }
 
-    public void setCoordinates(LatLng coordinates) {
+    public void setCoordinates(@Nullable LatLng coordinates) {
         this.coordinates = coordinates;
     }
 
@@ -201,7 +201,7 @@ public Media(String filename) {
         this.filename = filename;
     }
 
-    public Media(Uri localUri, String imageUrl, String filename, String description, long dataLength, Date dateCreated, Date dateUploaded, String creator) {
+    public Media(Uri localUri, String imageUrl, String filename, String description, long dataLength, Date dateCreated, @Nullable Date dateUploaded, String creator) {
         this();
         this.localUri = localUri;
         this.imageUrl = imageUrl;

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

@@ -27,12 +27,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         pager.setAdapter(adapter);
         indicator.setViewPager(pager);
-        adapter.setCallback(new WelcomePagerAdapter.Callback() {
-            @Override
-            public void onYesClicked() {
-                finish();
-            }
-        });
+        adapter.setCallback(this::finish);
     }
 
     @Override

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

@@ -26,6 +26,9 @@
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import timber.log.Timber;
 
+import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
@@ -63,18 +66,8 @@ public void onCreate(Bundle savedInstanceState) {
         twoFactorEdit.addTextChangedListener(textWatcher);
         passwordEdit.setOnEditorActionListener(newLoginInputActionListener());
 
-        loginButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                performLogin();
-            }
-        });
-        signupButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                signUp(v);
-            }
-        });
+        loginButton.setOnClickListener(this::performLogin);
+        signupButton.setOnClickListener(this::signUp);
     }
 
     private class LoginTextWatcher implements TextWatcher {
@@ -98,20 +91,17 @@ public void afterTextChanged(Editable editable) {
     }
 
     private TextView.OnEditorActionListener newLoginInputActionListener() {
-        return new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
-                if (loginButton.isEnabled()) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE) {
-                        performLogin();
-                        return true;
-                    } else if ((keyEvent != null) && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
-                        performLogin();
-                        return true;
-                    }
+        return (textView, actionId, keyEvent) -> {
+            if (loginButton.isEnabled()) {
+                if (actionId == IME_ACTION_DONE) {
+                    performLogin(textView);
+                    return true;
+                } else if ((keyEvent != null) && keyEvent.getKeyCode() == KEYCODE_ENTER) {
+                    performLogin(textView);
+                    return true;
                 }
-                return false;
             }
+            return false;
         };
     }
 
@@ -142,7 +132,7 @@ protected void onDestroy() {
         super.onDestroy();
     }
 
-    private void performLogin() {
+    private void performLogin(View view) {
         Timber.d("Login to start!");
         LoginTask task = getLoginTask();
         task.execute();

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

@@ -0,0 +1,24 @@
+package fr.free.nrw.commons.category;
+
+import com.pedrogomez.renderers.ListAdapteeCollection;
+import com.pedrogomez.renderers.RVRendererAdapter;
+import com.pedrogomez.renderers.RendererBuilder;
+
+import java.util.Collections;
+import java.util.List;
+
+class CategoriesAdapterFactory {
+    private final CategoriesRenderer.CategoryClickedListener listener;
+
+    CategoriesAdapterFactory(CategoriesRenderer.CategoryClickedListener listener) {
+        this.listener = listener;
+    }
+
+    public RVRendererAdapter<CategoryItem> create(List<CategoryItem> placeList) {
+        RendererBuilder<CategoryItem> builder = new RendererBuilder<CategoryItem>()
+                .bind(CategoryItem.class, new CategoriesRenderer(listener));
+        ListAdapteeCollection<CategoryItem> collection = new ListAdapteeCollection<>(
+                placeList != null ? placeList : Collections.<CategoryItem>emptyList());
+        return new RVRendererAdapter<>(builder, collection);
+    }
+}