From c234648de4a6869343875d4ea80e948d4af6a1e8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 11 Apr 2016 23:59:12 +0300
Subject: move to new gradle/wrapper possibly fix headlinefragment jumping bug
 on tablets bump version

---
 org.fox.ttrss/src/main/AndroidManifest.xml                       | 4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java      | 2 +-
 org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java    | 1 +
 org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 7 +++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 158ccbd2..e2ea6c28 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/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="403"
-    android:versionName="1.171" >
+    android:versionCode="404"
+    android:versionName="1.172" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index 6c3f90da..f6ac6b30 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -175,7 +175,7 @@ public class ArticlePager extends Fragment {
 					}
 					
 					if (m_article != null) {
-						if (m_article.id == 0 || m_articles.indexOf(m_article) == -1) {
+						if (m_article.id == 0 || !m_articles.containsId(m_article.id)) {
 							if (m_articles.size() > 0) {
 								m_article = m_articles.get(0);
 								m_listener.onArticleSelected(m_article, false);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 379661c4..dafcbe66 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -279,6 +279,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 			Article article = hf.getActiveArticle();
 						
 			if (article == null && hf.getAllArticles().size() > 0) {
+
 				article = hf.getAllArticles().get(0);
 
 				hf.setActiveArticle(article);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index b69fe3be..52b9de48 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -598,8 +598,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 					if (result != null) {
 						m_refreshInProgress = false;
 
-						if (m_articles.indexOf(m_activeArticle) == -1)
+						if (m_activeArticle != null && !m_articles.containsId(m_activeArticle.id)) {
 							m_activeArticle = null;
+						}
 
 						if (m_firstIdChanged) {
 							m_articles.add(new Article(ARTICLE_SPECIAL_TOP_CHANGED));
@@ -613,7 +614,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 						// not sure why but listview sometimes gets positioned while ignoring the header so
 						// top headline content becomes partially obscured by the toolbar on phones
 						// (not reproducible on avd)
-						if (!fappend) m_list.smoothScrollToPosition(0);
+						if (!fappend) {
+							m_list.smoothScrollToPosition(0);
+						}
 
 					} else {
 						if (m_lastError == ApiError.LOGIN_FAILED) {
-- 
cgit v1.2.3-54-g00ecf