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

misaochan · misaochan · commit f52c1819b539 · 2017-02-28T21:50:54.000+10:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently and try reverting if the proguard.cfg modification is enough.
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
@@ -1,3 +1,4 @@
 -dontobfuscate
 -keep class org.apache.http.** { *; }
--dontwarn org.apache.http.**
+-dontwarn org.apache.http.**
+-keep class fr.free.nrw.commons.upload.MwVolleyApi$Page {*;}

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ android {`
`39`	`39`
`40`	`40`	`buildTypes {`
`41`	`41`	`release {`
`42`		`- minifyEnabled true`
	`42`	`+ minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently and try reverting if the proguard.cfg modification is enough.`
`43`	`43`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'`
`44`	`44`	`}`
`45`	`45`	`}`