Merge pull request #2907 from nextcloud/fixAndroid4x

fix android 4.x
nextcloud · Aug 21, 2018 · c18ed12 · c18ed12
2 parents 6458998 + 15f6579
commit c18ed12
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 3.2.2 (August, 21, 2018)
+fix crash on Android 4.x
+
+## 3.2.2 (August, 20, 2018)
+Simple Signup
+
+## 3.2.1 (June, 11, 2018)
+Enhanced file detail/sharing screen for mail-shares
+Fix local sorting and file selection
+Fix local filtering
+Fix back navigation on privacy screen
+Fix bug on searching
+Fix crash on sorting
+Fix wrong menu highlighting
+various bug fixes
+
 ## 3.2.1 (June, 10, 2018)
 - Enhanced file detail/sharing screen for mail-shares
 - Fix local sorting and file selection

diff --git a/build.gradle b/build.gradle
@@ -60,7 +60,7 @@ repositories {
 // semantic versioning for version code
 def versionMajor = 3
 def versionMinor = 2
-def versionPatch = 2
+def versionPatch = 3
 def versionBuild = 99 // 0-49=Alpha / 50-98=RC / 99=stable
 
 android {
@@ -89,7 +89,6 @@ android {
         testInstrumentationRunnerArgument "TEST_SERVER_URL", "\"$System.env.OCTEST_SERVER_BASE_URL\""
 
         multiDexEnabled true
-        vectorDrawables.useSupportLibrary = true
 
         versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
 

diff --git a/fastlane/metadata/android/en-US/changelogs/30020199.txt b/fastlane/metadata/android/en-US/changelogs/30020199.txt
@@ -0,0 +1,9 @@
+## 3.2.1 (June, 11, 2018)
+Enhanced file detail/sharing screen for mail-shares
+Fix local sorting and file selection
+Fix local filtering
+Fix back navigation on privacy screen
+Fix bug on searching
+Fix crash on sorting
+Fix wrong menu highlighting
+various bug fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/30020299.txt b/fastlane/metadata/android/en-US/changelogs/30020299.txt
@@ -0,0 +1,2 @@
+## 3.2.2 (August, 20, 2018)
+Simple Signup
diff --git a/fastlane/metadata/android/en-US/changelogs/30020399.txt b/fastlane/metadata/android/en-US/changelogs/30020399.txt
@@ -0,0 +1,2 @@
+## 3.2.2 (August, 21, 2018)
+fix crash on Android 4.x
diff --git a/src/main/res/drawable-hdpi/first_run_files.png b/src/main/res/drawable-hdpi/first_run_files.png
diff --git a/src/main/res/drawable-hdpi/first_run_groupware.png b/src/main/res/drawable-hdpi/first_run_groupware.png
diff --git a/src/main/res/drawable-hdpi/first_run_talk.png b/src/main/res/drawable-hdpi/first_run_talk.png
diff --git a/src/main/res/drawable/first_run_files.xml b/src/main/res/drawable/first_run_files.xml
diff --git a/src/main/res/drawable/first_run_groupware.xml b/src/main/res/drawable/first_run_groupware.xml
diff --git a/src/main/res/drawable/first_run_talk.xml b/src/main/res/drawable/first_run_talk.xml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## 3.2.2 (August, 21, 2018)
		fix crash on Android 4.x