summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-02-14 22:03:16 +0300
committerAndrew Dolgov <[email protected]>2015-02-14 22:03:16 +0300
commit8f4b9187f6f8960864a0631a06d80b584cf95690 (patch)
tree94d3061c8f09c347431b805212d6e4905ae69196 /org.fox.ttrss/src/main
parent079328118c618d8f23f4fb411b181be07211f6e5 (diff)
fix mysterious crashes on some feeds
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 41b45610..9ebd56bc 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="312"
- android:versionName="1.89" >
+ android:versionCode="313"
+ android:versionName="1.90" >
<uses-sdk
android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
index a37ff0f2..bff85901 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
@@ -461,10 +461,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
} else {
- ActivityOptionsCompat options = ActivityOptionsCompat.makeSceneTransitionAnimation(this);
- ActivityCompat.startActivityForResult(this, intent, HEADLINES_REQUEST, options.toBundle());
+ // mysterious crashes if we use activitycompat here so welp
+ startActivityForResult(intent, HEADLINES_REQUEST);
}
+
} else {
invalidateOptionsMenu();