From fc42c5f5c17a82c968e3d26eb1c321dcd137ee63 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 11:09:24 +0100 Subject: [PATCH 1/3] #1294 Landing page is not displayed on Wikimedia zims --- .../kiwix/kiwixmobile/ZimContentProvider.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java index 255354f115..fc4b4c279e 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/ZimContentProvider.java @@ -28,16 +28,6 @@ import android.os.ParcelFileDescriptor.AutoCloseOutputStream; import android.util.Log; import android.webkit.MimeTypeMap; - -import org.kiwix.kiwixlib.JNIKiwix; -import org.kiwix.kiwixlib.JNIKiwixException; -import org.kiwix.kiwixlib.JNIKiwixInt; -import org.kiwix.kiwixlib.JNIKiwixReader; -import org.kiwix.kiwixlib.JNIKiwixSearcher; -import org.kiwix.kiwixlib.JNIKiwixString; -import org.kiwix.kiwixlib.Pair; -import org.kiwix.kiwixmobile.utils.files.FileUtils; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -49,8 +39,15 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.inject.Inject; +import org.kiwix.kiwixlib.JNIKiwix; +import org.kiwix.kiwixlib.JNIKiwixException; +import org.kiwix.kiwixlib.JNIKiwixInt; +import org.kiwix.kiwixlib.JNIKiwixReader; +import org.kiwix.kiwixlib.JNIKiwixSearcher; +import org.kiwix.kiwixlib.JNIKiwixString; +import org.kiwix.kiwixlib.Pair; +import org.kiwix.kiwixmobile.utils.files.FileUtils; import static org.kiwix.kiwixmobile.utils.Constants.TAG_KIWIX; @@ -344,7 +341,7 @@ public String getType(Uri uri) { // This is the code which retrieve the mimeType from the libzim // "slow" and still bugyy - if (mimeType.isEmpty()) { + if (mimeType == null || mimeType.isEmpty()) { String t = uri.toString(); int pos = uri.toString().indexOf(CONTENT_URI.toString()); if (pos != -1) { From fc9a6ea35220087a2fb53426506c1296e2aada85 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 11:56:24 +0100 Subject: [PATCH 2/3] #1294 update to latest encoded secrets --- secrets.tar.enc | Bin 10256 -> 20496 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets.tar.enc b/secrets.tar.enc index 05e3c25c981979ac51d0c392362605bc77c2a7d5..84725abc8af6e6c8ae1ac5958fcfd471279c067d 100644 GIT binary patch literal 20496 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 XbNV-v+yM|2lRFDw7}#TPnRRN6z4FEd literal 10256 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 z zBpi|+dE1W_bM-Z2but)4zZxAL*hwcUc#cu6LGK6HCIWop@qcjEBg2!CFYd0+VC|Qs zi8(H}z08Gy*DRc9i@d)-C#9*U#0dnn)+C|5YTyLsy^$s=K}!#B^?rW11@L8AC&dbU z@~>OsXUQ5Nlz;f_P=p0I3G^IPOt0?u&zVSpNoN@}<3*Jke*fTKhC?to0u??woin$! z2G=*zF93f~F;sro(+l~3H^6Fz2=${l00Q>nM6c&yL|tbO+zO>$Zw%Srv*kyEDMoSc zDPPC9m6&m}p9V*Ffu9caWTD29-Iswj9D662xbFKz@A`LXitBd%)L*$@0)2im1Fadr zYb_G{zp%B}ZiGbKz7s#__&;@^1@&KPiG7c#RNLyU^vsS>5O!JK0Z-Ye``BtsoQp2f zvj^R6I;iD&cIv9T)!P*s*bP7O%JC!)UDDDKFy;%pypbpmxWHuafO%K12r{7DOfx50 zVd8To{p>qvKANZGsh5HxrI#Q6E_QQr6VEC1s$Dk+Uo3d(acPl!m9emUQQwtE;UBoK zvvrtdTQr;V%t0aE-N2G_Ca{H!^99Blk4Gg%j^?^K;RV)P+V;H&che0Uq=zS^KGO=% z=E&~}=S0j?IhL=d*meqHpTVE$~Zyp{VJh$x3h(Cb{SX`CSoawEQR43gO{Q~%j_gBf=w+( zWSBxHO1vVb--Hk~gWO5?rb34=_*s zRk}zHmpOF&&>|>TLgjzOXc}V_U0*&>LY`{hK z%%TtLPxbv&B}-{8;j0&R4-;@t&s?t@+3;1XfGwIDh&|2PFu_h(a{|?Aj|ulbWsNS7 z3++s8aZ;?`wZoko1m@nR1w?h79=EM9l{re++H8iZe0kB8t1w&`6BiWghvnqYtgABt-Wnten^|8fnRbY}ffx!Tlsl=r5O( zxK%o9MxwI2lK~SfCXaMGWUTG`Qydg4^>G%#3)t4nDMm$B8-;7Kxnksm@pGX<+r|Pn z$}Vf8nnsA!NG_uT@PMmIpv5Lj%m%G04`(s1O}hKm#20Bj`SkWF_(hIaYR{KEA>Wpw zIkR~oGz}J?EbNK(qgllidWdd?SV#JR7Q1~WgzYsPez?mTjC4gg>Rb2XA?X=wVN3p^ z43JJMq!ka-iBJ`d8g0H|qpABtBpFn6X{zX#=Dhj*n;=@5C!>lbzbOCXmbmVgXnjfN`HFikh7xkY1t!ZsGIn)_7y5RJ?)49=`8 zyY5;Zf;@7u4>hsxp8>QY$e6~*tY^v From 88c65bce1b9e1d476524332c4a87783eecd843a0 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 9 Aug 2019 12:29:36 +0100 Subject: [PATCH 3/3] #1294 bump version number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 074d717a5c..893bba8933 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -188,7 +188,7 @@ def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { versionMajor = 2 versionMinor = 5 - versionPatch = 1 + versionPatch = 2 } private String generateVersionName() {