summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-15 19:49:27 +0400
committerAndrew Dolgov <[email protected]>2014-10-15 19:49:27 +0400
commit905679c7ef283f788832896e45eda8d802b1ec6f (patch)
tree9e0545f226a3b6a78fc83f38c8cda820aa959014
parentf292677c71dce9dff4135988f39ab994f59571ec (diff)
bump version
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java13
2 files changed, 3 insertions, 14 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf00b379..8fad2a4e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="237"
- android:versionName="1.39" >
+ android:versionCode="238"
+ android:versionName="1.40" >
<uses-sdk
android:minSdkVersion="8"
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 3321deb9..caeba009 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -27,21 +27,17 @@ import android.content.res.Resources.Theme;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.text.Html;
-import android.text.Html.ImageGetter;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@@ -49,7 +45,6 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.webkit.WebView;
-import android.webkit.WebView.HitTestResult;
import android.widget.AbsListView;
import android.widget.AbsListView.OnScrollListener;
import android.widget.AdapterView;
@@ -859,7 +854,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
WebSettings ws = content.getSettings();
ws.setSupportZoom(false);
ws.setDefaultFontSize(headlineFontSize);
-
+
content.loadDataWithBaseURL(baseUrl, articleContent, "text/html", "utf-8", null);
}
@@ -1086,11 +1081,5 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
public Feed getFeed() {
return m_feed;
}
-
- /* @Override
- public void onRefreshStarted(View view) {
- refresh(false);
- } */
-
}