From 4edf2edaedb09e444baa4d482e31b9c9ceb6c147 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 29 Oct 2019 10:24:57 +0000 Subject: [PATCH 1/6] Redo allowing all cleartext traffic 1563 --- app/src/main/AndroidManifest.xml | 6 ++++-- app/src/main/res/xml/network_security_config.xml | 7 ------- 2 files changed, 4 insertions(+), 9 deletions(-) delete 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 b141a0d18..5ac4332a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -22,10 +23,11 @@ android:hardwareAccelerated="true" android:icon="@mipmap/kiwix_icon" android:label="@string/app_name" - android:networkSecurityConfig="@xml/network_security_config" android:roundIcon="@mipmap/kiwix_icon_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true" + tools:targetApi="m"> - - - kiwix.org - localhost - - From 8cc863de766ecb68a23685a534de2e3105636171 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 29 Oct 2019 10:30:39 +0000 Subject: [PATCH 2/6] Mark meta fields not required 1566 --- .../kiwixmobile/library/entity/MetaLinkNetworkEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntity.java b/app/src/main/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntity.java index 450061531..b26312164 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/library/entity/MetaLinkNetworkEntity.java @@ -52,9 +52,9 @@ public class MetaLinkNetworkEntity { public List urls; @Element private long size; - @ElementMap(entry = "hash", key = "type", attribute = true, inline = true) + @ElementMap(entry = "hash", key = "type", attribute = true, inline = true, required = false) public Map hashes; - @Element + @Element(required = false) public Pieces pieces; public String getName() { From a840e9527b10064b2e28ce040463241f033716a0 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 29 Oct 2019 10:36:25 +0000 Subject: [PATCH 3/6] Update to 3.0.5 --- CHANGELOG | 4 ++++ app/build.gradle | 2 +- app/src/kiwix/play/listings/en-US/full-description.txt | 4 ++-- app/src/kiwix/play/release-notes/en-US/default.txt | 6 ++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a185dd081..4eb8700a2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +3.0.5 +BUGFIX: Some zim files could not be downloaded due to missing metadata +BUGFIX: Some mirrors were not allowed to download via http + 3.0.4 BUGFIX: Some users language was causing a crash due to unstable ISO codes BUGFIX: Some unstable zim files were crashing when opened diff --git a/app/build.gradle b/app/build.gradle index 0ab84e2d2..75bb22dea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -193,7 +193,7 @@ def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { versionMajor = 3 versionMinor = 0 - versionPatch = 4 + versionPatch = 5 } private String generateVersionName() { diff --git a/app/src/kiwix/play/listings/en-US/full-description.txt b/app/src/kiwix/play/listings/en-US/full-description.txt index e54c7c8e6..063e23fef 100644 --- a/app/src/kiwix/play/listings/en-US/full-description.txt +++ b/app/src/kiwix/play/listings/en-US/full-description.txt @@ -1,7 +1,7 @@ The whole of Wikipedia on your device! -The app is a lightweight piece of software reading bigger files stored on your device or SD card: once it is installed, you can select which additional content you would like to download (Wikipedia, Wiktionary, TED talks, etc.) and be ready for when your internet connexion is bad (or need to be in airplane mode)! +The app is a lightweight piece of software reading bigger files stored on your device or SD card: once it is installed, you can select which additional content you would like to download (Wikipedia, Wiktionary, TED talks, etc.) and be ready for when your internet connection is bad (or need to be in airplane mode)! Please read the instructions inside the App or on the website (www.kiwix.org) to learn about the various contents that are available for download. -Note: Kiwix is also available on regular computers (Windows, Mac, Linux). \ No newline at end of file +Note: Kiwix is also available on regular computers (Windows, Mac, Linux). diff --git a/app/src/kiwix/play/release-notes/en-US/default.txt b/app/src/kiwix/play/release-notes/en-US/default.txt index 0d134254f..e5b649d2b 100644 --- a/app/src/kiwix/play/release-notes/en-US/default.txt +++ b/app/src/kiwix/play/release-notes/en-US/default.txt @@ -1,4 +1,2 @@ -BUGFIX: Some users language was causing a crash due to unstable ISO codes -BUGFIX: Some unstable zim files were crashing when opened -BUGFIX: Long titles were rendering off screen on home page -BUGFIX: Issues when opening a file externally +BUGFIX: Some zim files could not be downloaded due to missing metadata +BUGFIX: Some mirrors were not allowed to download via http From 520fbdf0424b77d4b2ba8d815a778a35ebe514af Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 10 Dec 2019 10:42:02 +0000 Subject: [PATCH 4/6] update changelog --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4eb8700a2..c9d1c6e39 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +3.1.0 +NEW: Revamped Night Mode +NEW: Books unsupported by file system are greyed out ++ Bugfixes & Lots More + + 3.0.5 BUGFIX: Some zim files could not be downloaded due to missing metadata BUGFIX: Some mirrors were not allowed to download via http From 39e760eb271ed411f8a57ecdbfe4141435baf11e Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 10 Dec 2019 16:41:47 +0000 Subject: [PATCH 5/6] update changelog for tags --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c9d1c6e39..4b76d93dc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 3.1.0 NEW: Revamped Night Mode NEW: Books unsupported by file system are greyed out +NEW: Tags for books + Bugfixes & Lots More From 9b82c2dab5cbeec60bde7c8fa6f70054d5453496 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 10 Dec 2019 16:46:44 +0000 Subject: [PATCH 6/6] update version number --- app/build.gradle.kts | 4 ++-- core/objectbox-models/default.json.bak | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2a6dd3d6..6e358aa99 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,8 +10,8 @@ apply(from = rootProject.file("jacoco.gradle")) ext { set("versionMajor", 3) - set("versionMinor", 0) - set("versionPatch", 4) + set("versionMinor", 1) + set("versionPatch", 0) } fun generateVersionName() = "${ext["versionMajor"]}.${ext["versionMinor"]}.${ext["versionPatch"]}" diff --git a/core/objectbox-models/default.json.bak b/core/objectbox-models/default.json.bak index 9ed3079c0..5d2e402e8 100644 --- a/core/objectbox-models/default.json.bak +++ b/core/objectbox-models/default.json.bak @@ -5,7 +5,7 @@ "entities": [ { "id": "3:5536749840871435068", - "lastPropertyId": "16:6142333908132117423", + "lastPropertyId": "17:2701677664876214591", "name": "BookOnDiskEntity", "properties": [ { @@ -67,6 +67,10 @@ { "id": "16:6142333908132117423", "name": "favIcon" + }, + { + "id": "17:2701677664876214591", + "name": "tags" } ], "relations": [] @@ -197,7 +201,7 @@ }, { "id": "8:8093454424037540087", - "lastPropertyId": "23:5485468735259326535", + "lastPropertyId": "24:4272820830206771469", "name": "FetchDownloadEntity", "properties": [ { @@ -287,6 +291,10 @@ { "id": "23:5485468735259326535", "name": "progress" + }, + { + "id": "24:4272820830206771469", + "name": "tags" } ], "relations": []