From a159b23dc0d372c8ce180fc518ac6ccca4bd00d0 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 18 Dec 2018 15:46:18 -0200 Subject: [PATCH 1/2] [android] Disable Conversation Enter Transition for Samsung 7 devices --- .../briar/android/contact/ContactListFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java index bbf1a3fd2..11c685a3d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java @@ -56,6 +56,7 @@ import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID; +import static org.briarproject.briar.android.util.UiUtils.isSamsung7; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -114,7 +115,7 @@ public class ContactListFragment extends BaseFragment implements EventListener { ContactId contactId = item.getContact().getId(); i.putExtra(CONTACT_ID, contactId.getInt()); - if (SDK_INT >= 23) { + if (SDK_INT >= 23 && !isSamsung7()) { ContactListItemViewHolder holder = (ContactListItemViewHolder) list .getRecyclerView() From c8487483ff01672fc81d00dc7becd5472f9334a3 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 18 Dec 2018 18:17:27 -0200 Subject: [PATCH 2/2] [android] Also consider Android 7.1 (API 25) to be Samsung7 which is used for disabling certain features due to crashes there. --- .../main/java/org/briarproject/briar/android/util/UiUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java index b57a1c9c1..eb7ecd9af 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java @@ -258,7 +258,8 @@ public class UiUtils { } public static boolean isSamsung7() { - return SDK_INT == 24 && MANUFACTURER.equalsIgnoreCase("Samsung"); + return (SDK_INT == 24 || SDK_INT == 25) && + MANUFACTURER.equalsIgnoreCase("Samsung"); } public static void setFilterTouchesWhenObscured(View v, boolean filter) {