From ee19d5b834b567f3c84532091d0f4bdf4b57a7d2 Mon Sep 17 00:00:00 2001 From: cip Date: Fri, 5 Apr 2013 18:33:42 +0200 Subject: [PATCH] android fix issue #445 "Blank pages on Android" zimlib does not correctly handle fragments (#...), strip them in java for now. Note that besides rotation/reload bug also lead to blank page if clicked link contains fragment (and is not same page) --- src/org/kiwix/kiwixmobile/ZimContentProvider.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/kiwix/kiwixmobile/ZimContentProvider.java b/src/org/kiwix/kiwixmobile/ZimContentProvider.java index 25602fae3..33bb1abbf 100644 --- a/src/org/kiwix/kiwixmobile/ZimContentProvider.java +++ b/src/org/kiwix/kiwixmobile/ZimContentProvider.java @@ -189,11 +189,18 @@ public class ZimContentProvider extends ContentProvider { Log.d("zimgap", "Retrieving :" + articleUri.toString()); + String t = articleUri.toString(); int pos = articleUri.toString().indexOf(CONTENT_URI.toString()); if (pos != -1) t = articleUri.toString().substring( CONTENT_URI.toString().length()); + // Remove fragment (#...) as not supported by zimlib + pos = t.indexOf("#"); + if (pos != -1) { + t = t.substring(0, pos); + } + this.out = out; this.articleZimUrl = t; } @@ -223,7 +230,7 @@ public class ZimContentProvider extends ContentProvider { out.flush(); Log.d("zimgap", "reading " + articleZimUrl - + " finished."); + + "(mime "+mime.value+", size: "+size.value+") finished."); } catch (IOException e) { Log.e(getClass().getSimpleName(), "Exception reading article " + articleZimUrl + " from zim file", e);