diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 7d8ce2a1f..04a8ce595 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -537,7 +537,7 @@ private void openInBrowser(int currentPosition) {
link = rssItem.getLink();
}
- if (link.length() > 0) {
+ if (!link.isEmpty()) {
newsDetailFragment.loadURL(link);
}
} else {
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index eba214966..cf60cde4c 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -79,8 +79,9 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
private int section_number;
protected String html;
- private String title = "";
- private String baseUrl = null;
+ // private String title = "";
+ // private String baseUrl = null;
+ private final float scalingFactor = Float.parseFloat(mPrefs.getString(SettingsActivity.SP_FONT_SIZE, "1.0"));
// private GestureDetector mGestureDetector;
@@ -254,8 +255,7 @@ protected void startLoadRssItemToWebViewTask(NewsDetailActivity ndActivity) {
init_webView();
RssItem rssItem = ndActivity.rssItems.get(section_number);
- title = rssItem.getTitle();
- Log.d(TAG, "startLoadRssItemToWebViewTask: " + title);
+ Log.d(TAG, "startLoadRssItemToWebViewTask: " + rssItem.getTitle());
RssItemToHtmlTask task = new RssItemToHtmlTask(ndActivity, rssItem, this, mPrefs);
AsyncTaskHelper.StartAsyncTask(task);
}
@@ -306,6 +306,8 @@ private void applyWebSettings() {
webSettings.setSupportZoom(false);
webSettings.setMediaPlaybackRequiresUserGesture(true);
+ webSettings.setTextZoom(Math.round(scalingFactor * 100));
+
syncIncognitoState();
}
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
index 6163ad6c6..65e91c2c4 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java
@@ -22,18 +22,14 @@
import com.bumptech.glide.request.target.Target;
import java.io.File;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Locale;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import de.luhmer.owncloudnewsreader.R;
-import de.luhmer.owncloudnewsreader.SettingsActivity;
import de.luhmer.owncloudnewsreader.database.model.Feed;
import de.luhmer.owncloudnewsreader.database.model.RssItem;
import de.luhmer.owncloudnewsreader.helper.ImageHandler;
@@ -127,9 +123,9 @@ public static String getHtmlPage(RequestManager glide, RssItem rssItem, boolean
builder.append("");
// font size scaling
- builder.append("");
+ // builder.append("");
builder.append(String.format("", body_id, rtlClass));
@@ -278,6 +274,7 @@ private static String getCachedFavIcon(RequestManager glide, String favIconUrl)
}
}
+ /*
private static String getFontSizeScalingCss(SharedPreferences mPrefs) {
// font size scaling
double scalingFactor = Float.parseFloat(mPrefs.getString(SettingsActivity.SP_FONT_SIZE, "1.0"));
@@ -296,6 +293,7 @@ private static String getFontSizeScalingCss(SharedPreferences mPrefs) {
fontFormat.format(scalingFactor * SUBSCRIPT_FONT_SIZE)
);
}
+ */
private static String getDescriptionWithCachedImages(RequestManager glide, String articleUrl, String text) {
List links = ImageHandler.getImageLinksFromText(articleUrl, text);
@@ -328,7 +326,7 @@ private static String getDescriptionWithCachedImages(RequestManager glide, Strin
return text;
}
- private static RequestListener rl = new RequestListener<>() {
+ private static final RequestListener rl = new RequestListener<>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
// Log the GlideException here (locally or with a remote logging framework):