AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fix for broken content in webview on PP

Browse source
This commit is contained in:
Alexey Osminin 2020-12-09 19:13:38 +03:00 • committed by Alexander Boriskov
parent c2b9372edf
commit f501cb1c04
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java
View file

@ -1,6 +1,7 @@
package com.mapswithme.maps.bookmarks.description;
import android.os.Bundle;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -55,6 +56,8 @@ public class BookmarksDescriptionFragment extends BaseMwmFragment
TextView btnDescription = view.findViewById(R.id.btn_description);
UiUtils.hide(btnDescription);
WebView webView = view.findViewById(R.id.webview);
webView.loadData(mBookmarkCategory.getDescription(), Utils.TEXT_HTML, Utils.UTF_8);
String base64version = Base64.encodeToString(mBookmarkCategory.getDescription().getBytes(),
Base64.DEFAULT);
webView.loadData(base64version, Utils.TEXT_HTML, Utils.BASE_64);
}
}

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -16,6 +16,7 @@ import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.text.util.Linkify;
import android.util.AttributeSet;
import android.util.Base64;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -1621,7 +1622,8 @@ public class PlacePageView extends NestedScrollViewClickFixed
if (StringUtils.nativeIsHtml(notes))
{
mWvBookmarkNote.loadData(notes, "text/html; charset=utf-8", null);
String base64version = Base64.encodeToString(notes.getBytes(), Base64.DEFAULT);
mWvBookmarkNote.loadData(base64version, Utils.TEXT_HTML, Utils.BASE_64);
UiUtils.show(mWvBookmarkNote);
UiUtils.hide(mTvBookmarkNote);
}

1
android/src/com/mapswithme/util/Utils.java
View file

@ -61,6 +61,7 @@ public class Utils
@StringRes
public static final int INVALID_ID = 0;
public static final String UTF_8 = "utf-8";
public static final String BASE_64 = "base64";
public static final String TEXT_HTML = "text/html;";
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = "Utils";