mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
misaochan 2017-05-28 00:51:05 +10:00
commit f3aa259a7c
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -270,10 +270,6 @@ public class Utils {
} }
public static boolean isDarkTheme(Context context) { public static boolean isDarkTheme(Context context) {
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true)) { return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true);
return true;
}else {
return false;
}
} }
} }

7
app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java
View file

@ -57,12 +57,7 @@ public class ExistingFileAsync extends AsyncTask<Void, Void, Boolean> {
ArrayList<ApiResult> resultNodes = result.getNodes("/api/query/allimages/img"); ArrayList<ApiResult> resultNodes = result.getNodes("/api/query/allimages/img");
Timber.d("Result nodes: %s", resultNodes); Timber.d("Result nodes: %s", resultNodes);
boolean fileExists; boolean fileExists = !resultNodes.isEmpty();
if (!resultNodes.isEmpty()) {
fileExists = true;
} else {
fileExists = false;
}
Timber.d("File already exists in Commons: %s", fileExists); Timber.d("File already exists in Commons: %s", fileExists);
return fileExists; return fileExists;

5
gradle.properties
View file

@ -6,9 +6,8 @@ compileSdkVersion = android-25
buildToolsVersion = 25.0.1 buildToolsVersion = 25.0.1
minSdkVersion = 15 minSdkVersion = 15
# Needs to remain at API 23 until https://github.com/commons-app/apps-android-commons/issues/457
# is fixed targetSdkVersion = 25
targetSdkVersion = 23
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
# Library dependencies # Library dependencies