summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-05-29 12:37:08 +0300
committerAndrew Dolgov <[email protected]>2015-05-29 12:37:08 +0300
commit4e2bf266e2747bb1b56adff570951a9593781da9 (patch)
tree607e4584ea33d70d78416d3b073edf1105b5e32a
parent1b603e10a99bd0b78bbcdf565e2d679073b3f3e4 (diff)
why is this bitwise or in there wtf
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java2
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java2
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();
}