commit 21a3ea2189fd4016f5b6ed7d960437ac55d2f150
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Wed Apr 01 16:06:09 2020 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sun Apr 05 00:37:16 2020 -0400
tree f2ba5173b3d4ebce0d1b629b3ba39d9314025ff7
parent fd6ee5afbba76ea78b2bf3d11067200cb5795a2f

conversation fragment: use activity type to know if in tablet mode

Change-Id: If3d2c4570348bbe7e978e89f94a9a0cef74156e4

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 94a695f..3c86847 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -23,6 +23,7 @@
 import android.animation.LayoutTransition;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ComponentName;
@@ -950,7 +951,7 @@
     }
 
     private void setupActionbar(CallContact contact) {
-        if (!this.isVisible()) {
+        if (!isVisible()) {
             return;
         }
 
@@ -963,17 +964,17 @@
         String displayName = contact.getDisplayName();
         String identity = contact.getRingUsername();
 
-        if (DeviceUtils.isTablet(getContext())) {
+        Activity activity = getActivity();
+        if (activity instanceof HomeActivity) {
             Toolbar toolbar = getActivity().findViewById(R.id.main_toolbar);
             TextView title = toolbar.findViewById(R.id.contact_title);
             TextView subtitle = toolbar.findViewById(R.id.contact_subtitle);
             ImageView logo = toolbar.findViewById(R.id.contact_image);
 
-            if (!((HomeActivity) getActivity()).isConversationSelected()) {
+            if (!((HomeActivity) activity).isConversationSelected()) {
                 title.setText("");
                 subtitle.setText("");
                 logo.setImageDrawable(null);
-
                 return;
             }