From 7d5f5853e5468fd2338202db4f990a9492997809 Mon Sep 17 00:00:00 2001
From: Fotis Tsalampounis <fsketo@gmail.com>
Date: Sat, 20 May 2017 14:05:02 +0300
Subject: [PATCH 1/2] Updated target sdk version to 25

The camera crash bug does not seem to exist anymore. Another fix probably solved this issue too.
---
 gradle.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ccb036712..2effb80f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,9 +6,8 @@ compileSdkVersion = android-25
 buildToolsVersion = 25.0.1
 
 minSdkVersion = 15
-# Needs to remain at API 23 until https://github.com/commons-app/apps-android-commons/issues/457
-# is fixed
-targetSdkVersion = 23
+
+targetSdkVersion = 25
 android.useDeprecatedNdk=true
 
 # Library dependencies

From 7a8e04eec1cdcc6b2e1570b19d36aaec933b2827 Mon Sep 17 00:00:00 2001
From: Deskana <dgarry@wikimedia.org>
Date: Fri, 26 May 2017 11:16:22 +0100
Subject: [PATCH 2/2] Simplify if statements

This patch simplifies a few if statements by replacing them with returns, which helps improve code readability and simplicity.
---
 app/src/main/java/fr/free/nrw/commons/Utils.java           | 6 +-----
 .../java/fr/free/nrw/commons/upload/ExistingFileAsync.java | 7 +------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index 9d38cd92a..98388f660 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -270,10 +270,6 @@ public class Utils {
     }
 
     public static boolean isDarkTheme(Context context) {
-        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true)) {
-            return true;
-        }else {
-            return false;
-        }
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true);
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
index 27b9ed8d8..b52af06e9 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
@@ -57,12 +57,7 @@ public class ExistingFileAsync extends AsyncTask<Void, Void, Boolean> {
         ArrayList<ApiResult> resultNodes = result.getNodes("/api/query/allimages/img");
         Timber.d("Result nodes: %s", resultNodes);
 
-        boolean fileExists;
-        if (!resultNodes.isEmpty()) {
-            fileExists = true;
-        } else {
-            fileExists = false;
-        }
+        boolean fileExists = !resultNodes.isEmpty();
 
         Timber.d("File already exists in Commons: %s", fileExists);
         return fileExists;