From f7b263280bfe2969d46a3fce4bccd61653e3e177 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 18 Jun 2019 12:39:03 +0100 Subject: [PATCH 1/2] - Use http instead of https - Increase read timeout - bump abi codes to remove shadowing complaint - increase version to 2.5.1 --- app/build.gradle | 26 ++++++++++++++----- .../kiwixmobile/di/modules/NetworkModule.java | 9 ++++--- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c110629db..074d717a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,7 +148,6 @@ dependencies { //update this with androidx testImplementation 'com.jraska.livedata:testing-ktx:0.2.1' testImplementation 'android.arch.core:core-testing:1.1.1' - } // Set custom app import directory @@ -189,15 +188,28 @@ def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { versionMajor = 2 versionMinor = 5 - versionPatch = 0 + versionPatch = 1 } private String generateVersionName() { "${ext.versionMajor}.${ext.versionMinor}.${ext.versionPatch}" } +/* +* max version code: 210-0-00-00-00 +* our template : UUU-A-ZZ-YY-XX +* where: +* X = patch version +* Y = minor version +* Z = major version (+ 20 to distinguish from previous, non semantic, versions of the app) +* A = number representing ABI split +* U = unused +*/ private Integer generateVersionCode() { - 200000 + (ext.versionMajor * 10000) + (ext.versionMinor * 100) + (ext.versionPatch) + 20 * 10000 + + (ext.versionMajor * 10000) + + (ext.versionMinor * 100) + + (ext.versionPatch) } android { @@ -259,7 +271,7 @@ android { // Main build type for debugging debug { - buildConfigField "String", "KIWIX_DOWNLOAD_URL", "\"http://download.kiwix.org/\"" + buildConfigField "String", "KIWIX_DOWNLOAD_URL", "\"http://mirror.download.kiwix.org/\"" buildConfigField "boolean", "KIWIX_ERROR_ACTIVITY", "false" testCoverageEnabled true } @@ -279,7 +291,7 @@ android { // Release Type release { signingConfig signingConfigs.release - buildConfigField "String", "KIWIX_DOWNLOAD_URL", "\"http://download.kiwix.org/\"" + buildConfigField "String", "KIWIX_DOWNLOAD_URL", "\"http://mirror.download.kiwix.org/\"" buildConfigField "boolean", "KIWIX_ERROR_ACTIVITY", "false" } } @@ -425,13 +437,13 @@ android { experimental = true } - def abiCodes = ['arm64-v8a': 5, 'x86': 2, 'x86_64': 3, 'armeabi-v7a': 4] + def abiCodes = ['arm64-v8a': 6, 'x86': 3, 'x86_64': 4, 'armeabi-v7a': 5] splits { abi { enable true reset() include "x86", "x86_64", 'armeabi-v7a', "arm64-v8a" - universalApk false + universalApk buildNumber == "dev" } } applicationVariants.all { variant -> diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java index 8e49fc995..0969e69f5 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java @@ -25,22 +25,24 @@ import java.util.concurrent.TimeUnit; import javax.inject.Singleton; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; +import okhttp3.logging.HttpLoggingInterceptor.Level; import org.kiwix.kiwixmobile.BuildConfig; import org.kiwix.kiwixmobile.network.KiwixService; import org.kiwix.kiwixmobile.network.UserAgentInterceptor; @Module public class NetworkModule { - public static String KIWIX_DOWNLOAD_URL = BuildConfig.KIWIX_DOWNLOAD_URL; //"http://download.kiwix.org/"; + public static String KIWIX_DOWNLOAD_URL = BuildConfig.KIWIX_DOWNLOAD_URL; + //"http://download.kiwix.org/"; private final static String useragent = "kiwix-android-version:" + BuildConfig.VERSION_CODE; @Provides @Singleton OkHttpClient provideOkHttpClient() { HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); - logging.setLevel(HttpLoggingInterceptor.Level.BASIC); + logging.setLevel(BuildConfig.DEBUG ? Level.BODY : Level.BASIC); return new OkHttpClient().newBuilder().followRedirects(true).followSslRedirects(true) .connectTimeout(10, TimeUnit.SECONDS) - .readTimeout(10, TimeUnit.SECONDS) + .readTimeout(20, TimeUnit.SECONDS) .addNetworkInterceptor(logging) .addNetworkInterceptor(new UserAgentInterceptor(useragent)).build(); } @@ -53,5 +55,4 @@ import org.kiwix.kiwixmobile.network.UserAgentInterceptor; ConnectivityManager provideConnectivityManager(Context context) { return (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); } - } From e6801554306daf61c6eed0ef938288f0c61fb718 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 18 Jun 2019 13:05:08 +0100 Subject: [PATCH 2/2] - add network security config from master --- app/src/main/AndroidManifest.xml | 1 + app/src/main/res/xml/network_security_config.xml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 app/src/main/res/xml/network_security_config.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd50e65ad..f3017c940 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,7 @@ android:icon="@mipmap/kiwix_icon" android:label="@string/app_name" android:theme="@style/AppTheme" + android:networkSecurityConfig="@xml/network_security_config" android:supportsRtl="true"> + + + kiwix.org + + \ No newline at end of file