From 4e2bf266e2747bb1b56adff570951a9593781da9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 29 May 2015 12:37:08 +0300 Subject: why is this bitwise or in there wtf --- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 2 +- .../src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index c66a4d95..58ffaa7a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -183,7 +183,7 @@ public class ArticleFragment extends Fragment { if (t >= oldt && t >= ab.getHeight()) { ab.hide(); - } else if (t <= ab.getHeight() | oldt - t >= 10) { + } else if (t <= ab.getHeight() || oldt - t >= 10) { ab.show(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 35f86dc9..0211167f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -146,7 +146,7 @@ public class OfflineArticleFragment extends Fragment { if (t >= oldt && t >= ab.getHeight()) { ab.hide(); - } else if (t <= ab.getHeight() | oldt - t >= 10) { + } else if (t <= ab.getHeight() || oldt - t >= 10) { ab.show(); } -- cgit v1.2.3