Merge branch 'master' into dependency-injection

Author: psh

app/build.gradle

@@ -12,19 +12,25 @@ dependencies {
     compile 'ch.acra:acra:4.7.0'
     compile 'org.mediawiki:api:1.3'
     compile 'commons-codec:commons-codec:1.10'
+    compile 'com.github.pedrovgs:renderers:3.3.3'
+    compile 'com.google.code.gson:gson:2.8.1'
+    compile 'com.jakewharton.timber:timber:4.5.1'
+    compile 'info.debatty:java-string-similarity:0.24'
+    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar'){
+        transitive=true
+    }
+
     compile "com.android.support:support-v4:${project.supportLibVersion}"
     compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
     compile "com.android.support:design:${project.supportLibVersion}"
-    compile 'com.google.code.gson:gson:2.8.0'
+
+    compile "com.android.support:cardview-v7:${project.supportLibVersion}"
+
     compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
-    compile 'com.github.pedrovgs:renderers:3.3.3'
     annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
-    compile 'com.jakewharton.timber:timber:4.5.1'
+
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
     compile 'com.squareup.okio:okio:1.13.0'
-    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar'){
-        transitive=true
-    }
 
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
@@ -39,12 +45,12 @@ dependencies {
     compile 'com.facebook.stetho:stetho:1.5.0'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.3.2'
+    testCompile 'org.robolectric:robolectric:3.4'
 
     testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
-    androidTestCompile ('com.android.support.test.espresso:espresso-core:2.2.2'){
+    androidTestCompile ('com.android.support.test.espresso:espresso-core:3.0.1'){
         exclude group: 'com.google.code.findbugs'
     }
 

app/src/main/AndroidManifest.xml

@@ -19,8 +19,13 @@
         android:name=".CommonsApplication"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/LightAppTheme"
+        android:supportsRtl="true" >
+        <activity android:name="org.acra.CrashReportDialog"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true"
+                  android:finishOnTaskLaunch="true" />
 
         <activity
             android:name="org.acra.CrashReportDialog"

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

@@ -87,7 +87,7 @@ public void onCreate() {
     }
 
     @Override
-    protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
+     protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
         return injector();
     }
 
@@ -120,8 +120,7 @@ public void clearApplicationData(Context context, LogoutListener logoutListener)
                     //TODO: fix preference manager
                     defaultPrefs.edit().clear().commit();
                     applicationPrefs.edit().clear().commit();
-                    applicationPrefs.edit().putBoolean("firstrun", false).apply();
-                    otherPrefs.edit().clear().commit();
+                    applicationPrefs.edit().putBoolean("firstrun", false).apply();otherPrefs.edit().clear().commit();
                     updateAllDatabases();
 
                     logoutListener.onLogoutComplete();

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

@@ -1,5 +1,8 @@
 package fr.free.nrw.commons;
 
+import android.content.Context;
+import android.preference.PreferenceManager;
+
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 
@@ -9,9 +12,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.settings.Prefs;
 
-
 public class Utils {
 
     /**
@@ -76,10 +79,14 @@ 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;
     }
 
+    public static boolean isDarkTheme(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme", false);
+    }
 }

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

@@ -21,7 +21,7 @@ public abstract class AuthenticatedActivity extends NavigationBaseActivity {
     @Inject SessionManager sessionManager;
 
     private String authCookie;
-    
+
 
     private void getAuthCookie(Account account, AccountManager accountManager) {
         Single.fromCallable(() -> accountManager.blockingGetAuthToken(account, "", false))