aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-05-05 21:20:42 +0200
committerChristian Schneppe <christian@pix-art.de>2018-05-05 21:20:42 +0200
commitc408c78630c86472806f9d34fc8d20943cba653e (patch)
tree2d885ca68eb718dfc2f784483c8a31264d09d592 /src/main/java/de/pixart/messenger/ui
parent8e8ea0845e3c98785ef7d259a5c3f02b65cee686 (diff)
Support both new and old http upload namespaces
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index cdbdbd069..8e79d0acb 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1217,8 +1217,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
@Override
public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
- int animator = enter ? R.animator.fade_right_in : R.animator.fade_right_out;
- return AnimatorInflater.loadAnimator(getActivity(), animator);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ int animator = enter ? R.animator.fade_right_in : R.animator.fade_right_out;
+ return AnimatorInflater.loadAnimator(getActivity(), animator);
+ } else {
+ return null;
+ }
}
private void quoteText(String text) {