diff options
author | Andrew Dolgov <[email protected]> | 2015-05-29 12:37:08 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-05-29 12:37:08 +0300 |
commit | 4e2bf266e2747bb1b56adff570951a9593781da9 (patch) | |
tree | 607e4584ea33d70d78416d3b073edf1105b5e32a /org.fox.ttrss/src | |
parent | 1b603e10a99bd0b78bbcdf565e2d679073b3f3e4 (diff) |
why is this bitwise or in there wtf
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/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(); } |