iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss-android

Browse Source
This commit is contained in:
Andrew Dolgov 2016-04-12 08:57:51 +03:00
commit e9723861e7
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.3.0' classpath 'com.android.tools.build:gradle:2.0.0'
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Jan 27 11:47:07 AST 2015 #Mon Apr 11 22:43:55 MSK 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

2
org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
View File

@ -175,7 +175,7 @@ public class ArticlePager extends Fragment {
} }
if (m_article != null) { 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) { if (m_articles.size() > 0) {
m_article = m_articles.get(0); m_article = m_articles.get(0);
m_listener.onArticleSelected(m_article, false); m_listener.onArticleSelected(m_article, false);

1
org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
View File

@ -279,6 +279,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
Article article = hf.getActiveArticle(); Article article = hf.getActiveArticle();
if (article == null && hf.getAllArticles().size() > 0) { if (article == null && hf.getAllArticles().size() > 0) {
article = hf.getAllArticles().get(0); article = hf.getAllArticles().get(0);
hf.setActiveArticle(article); hf.setActiveArticle(article);

7
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -598,8 +598,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (result != null) { if (result != null) {
m_refreshInProgress = false; m_refreshInProgress = false;
if (m_articles.indexOf(m_activeArticle) == -1) if (m_activeArticle != null && !m_articles.containsId(m_activeArticle.id)) {
m_activeArticle = null; m_activeArticle = null;
}
if (m_firstIdChanged) { if (m_firstIdChanged) {
m_articles.add(new Article(ARTICLE_SPECIAL_TOP_CHANGED)); 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 // not sure why but listview sometimes gets positioned while ignoring the header so
// top headline content becomes partially obscured by the toolbar on phones // top headline content becomes partially obscured by the toolbar on phones
// (not reproducible on avd) // (not reproducible on avd)
if (!fappend) m_list.smoothScrollToPosition(0); if (!fappend) {
m_list.smoothScrollToPosition(0);
}
} else { } else {
if (m_lastError == ApiError.LOGIN_FAILED) { if (m_lastError == ApiError.LOGIN_FAILED) {

2
tt-rss-android.iml
View File

@ -9,8 +9,6 @@
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" /> <excludeFolder url="file://$MODULE_DIR$/.gradle" />