From 6e545d0100e162b8aad3d135435746609a8a344c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 13 May 2016 17:25:14 -0300
Subject: [PATCH] disable exit transition until we have a fix for it
---
.../android/contact/ContactListFragment.java | 8 +++-----
.../android/contact/ConversationActivity.java | 9 ++++++++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java
index 1e527a7ad4..d70f7d439c 100644
--- a/briar-android/src/org/briarproject/android/contact/ContactListFragment.java
+++ b/briar-android/src/org/briarproject/android/contact/ContactListFragment.java
@@ -1,7 +1,6 @@
package org.briarproject.android.contact;
import android.content.Intent;
-import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.FloatingActionButton;
@@ -51,6 +50,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
+import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.BriarActivity.GROUP_ID;
@@ -122,10 +122,8 @@ public class ContactListFragment extends BaseFragment implements EventListener {
Pair.create((View) holder.bulb, ViewCompat
.getTransitionName(holder.bulb));
ActivityOptionsCompat options =
- ActivityOptionsCompat
- .makeSceneTransitionAnimation(
- getActivity(), avatar,
- bulb);
+ makeSceneTransitionAnimation(getActivity(),
+ avatar, bulb);
ActivityCompat.startActivity(getActivity(), i,
options.toBundle());
}
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index fc35a6530b..2c8e3b5df4 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -212,7 +212,7 @@ public class ConversationActivity extends BriarActivity
// Handle presses on the action bar items
switch (item.getItemId()) {
case android.R.id.home:
- supportFinishAfterTransition();
+ onBackPressed();
return true;
case R.id.action_introduction:
if (contactId == null) return false;
@@ -232,6 +232,13 @@ public class ConversationActivity extends BriarActivity
}
}
+ @Override
+ public void onBackPressed() {
+ // FIXME disabled exit transition, because it doesn't work for some reason
+ //supportFinishAfterTransition();
+ finish();
+ }
+
private void loadData() {
runOnDbThread(new Runnable() {
@Override
--
GitLab