articlepager: fix context being lost after activity resume in offline

mode (closes #533)
bump version
This commit is contained in:
Andrew Dolgov 2013-02-14 13:03:39 +04:00
parent be9c8d6614
commit baf1bea932
3 changed files with 9 additions and 6 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="136" android:versionCode="137"
android:versionName="1.14" > android:versionName="1.15" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

View File

@ -188,13 +188,14 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector.
web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); web.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
} }
if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
cssOverride = "body { background : transparent; color : #e0e0e0}"; cssOverride = "body { background : transparent; color : #e0e0e0}";
} else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) { } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) {
cssOverride = "body { background : transparent; color : #e0e0e0}"; cssOverride = "body { background : transparent; color : #e0e0e0}";
} else { } else {
cssOverride = "body { background : transparent; }"; cssOverride = "body { background : transparent; }";
} }
web.setBackgroundColor(getResources().getColor(android.R.color.transparent));
String hexColor = String.format("#%06X", (0xFFFFFF & tv.data)); String hexColor = String.format("#%06X", (0xFFFFFF & tv.data));
cssOverride += " a:link {color: "+hexColor+";} a:visited { color: "+hexColor+";}"; cssOverride += " a:link {color: "+hexColor+";} a:visited { color: "+hexColor+";}";

View File

@ -137,6 +137,10 @@ public class OfflineArticlePager extends Fragment {
m_isCat = savedInstanceState.getBoolean("isCat", false); m_isCat = savedInstanceState.getBoolean("isCat", false);
} }
Log.d(TAG, "feed=" + m_feedId + "; iscat=" + m_isCat);
m_cursor = createCursor();
m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager()); m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager());
int position = 0; int position = 0;
@ -203,8 +207,6 @@ public class OfflineArticlePager extends Fragment {
m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
m_cursor = createCursor();
} }
public void refresh() { public void refresh() {