summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java2
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java20
2 files changed, 19 insertions, 3 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 5c77743a..323d9546 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -261,7 +261,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
setActiveArticleId(m_activeArticleId);
}
- refresh();
+ //refresh();
m_activity.invalidateOptionsMenu();
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
index ed146845..492db602 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
@@ -26,7 +26,9 @@ import org.fox.ttrss.R;
public class OfflineMasterActivity extends OfflineActivity implements OfflineHeadlinesEventListener {
private final String TAG = this.getClass().getSimpleName();
-
+
+ private static final int OFFLINE_HEADLINES_REQUEST = 1;
+
//private boolean m_actionbarUpEnabled = false;
//private int m_actionbarRevertDepth = 0;
private boolean m_feedIsSelected = false;
@@ -345,7 +347,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
intent.putExtra("isCat", hf.getFeedIsCat());
intent.putExtra("article", articleId);
- startActivityForResult(intent, 0);
+ startActivityForResult(intent, OFFLINE_HEADLINES_REQUEST);
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
} else {
@@ -358,4 +360,18 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
public void onArticleSelected(int articleId) {
onArticleSelected(articleId, true);
}
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == OFFLINE_HEADLINES_REQUEST) {
+
+ OfflineHeadlinesFragment ohf = (OfflineHeadlinesFragment)getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
+
+ if (ohf != null) {
+ ohf.refresh();
+ }
+ }
+
+ }
+
}