replace CallNotificationController with Activity (WIP)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt

@@ -41,7 +41,7 @@ import com.bluelinelabs.logansquare.LoganSquare
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.nextcloud.talk.R
-import com.nextcloud.talk.activities.CallActivity
+import com.nextcloud.talk.activities.CallNotificationActivity
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
@@ -178,7 +178,7 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
                                 )
                             }
                         } else if (type == "call") {
-                            val fullScreenIntent = Intent(applicationContext, CallActivity::class.java)
+                            val fullScreenIntent = Intent(applicationContext, CallNotificationActivity::class.java)
                             val bundle = Bundle()
                             bundle.putString(BundleKeys.KEY_ROOM_ID, decryptedPushMessage!!.id)
                             bundle.putParcelable(KEY_USER_ENTITY, signatureVerification!!.userEntity)

app/src/main/AndroidManifest.xml

@@ -131,6 +131,14 @@
             android:taskAffinity=".call"
             android:excludeFromRecents="true" />
 
+        <activity
+            android:name=".activities.CallNotificationActivity"
+            android:theme="@style/AppTheme.CallLauncher"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:taskAffinity=".call"
+            android:excludeFromRecents="true" />
+
         <activity
             android:name=".activities.FullScreenImageActivity"
             android:theme="@style/FullScreenImageTheme"

app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.controllers;
+package com.nextcloud.talk.activities;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -32,32 +32,24 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.renderscript.RenderScript;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.facebook.common.executors.UiThreadImmediateExecutorService;
 import com.facebook.common.references.CloseableReference;
 import com.facebook.datasource.DataSource;
 import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
 import com.facebook.imagepipeline.image.CloseableImage;
 import com.facebook.imagepipeline.postprocessors.BlurPostProcessor;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.nextcloud.talk.R;
-import com.nextcloud.talk.activities.CallActivity;
 import com.nextcloud.talk.api.NcApi;
 import com.nextcloud.talk.application.NextcloudTalkApplication;
-import com.nextcloud.talk.controllers.base.BaseController;
+import com.nextcloud.talk.databinding.CallNotificationActivityBinding;
 import com.nextcloud.talk.events.CallNotificationClick;
 import com.nextcloud.talk.events.ConfigurationChangeEvent;
 import com.nextcloud.talk.models.RingtoneSettings;
@@ -86,11 +78,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import autodagger.AutoInjector;
-import butterknife.BindView;
 import butterknife.OnClick;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -99,9 +89,9 @@ import io.reactivex.schedulers.Schedulers;
 import okhttp3.Cache;
 
 @AutoInjector(NextcloudTalkApplication.class)
-public class CallNotificationController extends BaseController {
+public class CallNotificationActivity extends BaseActivity {
 
-    public static final String TAG = "CallNotificationController";
+    public static final String TAG = "CallNotificationActivity";
 
     @Inject
     NcApi ncApi;
@@ -118,27 +108,6 @@ public class CallNotificationController extends BaseController {
     @Inject
     Context context;
 
-    @BindView(R.id.incomingCallVoiceOrVideoTextView)
-    TextView incomingCallVoiceOrVideoTextView;
-
-    @BindView(R.id.conversationNameTextView)
-    TextView conversationNameTextView;
-
-    @BindView(R.id.avatarImageView)
-    SimpleDraweeView avatarImageView;
-
-    @BindView(R.id.callAnswerVoiceOnlyView)
-    SimpleDraweeView callAnswerVoiceOnlyView;
-
-    @BindView(R.id.callAnswerCameraView)
-    SimpleDraweeView callAnswerCameraView;
-
-    @BindView(R.id.backgroundImageView)
-    ImageView backgroundImageView;
-
-    @BindView(R.id.incomingTextRelativeLayout)
-    RelativeLayout incomingTextRelativeLayout;
-
     private List<Disposable> disposablesList = new ArrayList<>();
     private Bundle originalBundle;
     private String roomId;
@@ -147,63 +116,97 @@ public class CallNotificationController extends BaseController {
     private Conversation currentConversation;
     private MediaPlayer mediaPlayer;
     private boolean leavingScreen = false;
-    private RenderScript renderScript;
     private Handler handler;
+    private CallNotificationActivityBinding binding;
 
-    public CallNotificationController(Bundle args) {
+    @Override
-        super(args);
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
         eventBus.post(new CallNotificationClick());
-        this.roomId = args.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
-        this.currentConversation = Parcels.unwrap(args.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
-        this.userBeingCalled = args.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
 
-        this.originalBundle = args;
+        binding = CallNotificationActivityBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        Bundle extras = getIntent().getExtras();
+        this.roomId = extras.getString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), "");
+        this.currentConversation = Parcels.unwrap(extras.getParcelable(BundleKeys.INSTANCE.getKEY_ROOM()));
+        this.userBeingCalled = extras.getParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY());
+
+        this.originalBundle = extras;
         credentials = ApiUtils.getCredentials(userBeingCalled.getUsername(), userBeingCalled.getToken());
+
+        setCallDescriptionText();
+
+        if (currentConversation == null) {
+            handleFromNotification();
+        } else {
+            runAllThings();
+        }
+
+        if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) {
+            playRingtoneSound();
+        }
+
+        initClickListeners();
     }
 
+    @SuppressLint({"LongLogTag"})
     @Override
-    protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
+    public void onStart() {
-        return inflater.inflate(R.layout.controller_call_notification, container, false);
+        super.onStart();
+
+        if (handler == null) {
+            handler = new Handler();
+
+            try {
+                cache.evictAll();
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to evict cache");
+            }
+        }
+    }
+
+    private void initClickListeners() {
+        binding.callAnswerVoiceOnlyView.setOnClickListener(l -> {
+            originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), true);
+            proceedToCall();
+        });
+
+        binding.callAnswerCameraView.setOnClickListener(l -> {
+            originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
+            proceedToCall();
+        });
+
+        binding.hangupButton.setOnClickListener(l -> hangup());
+    }
+
+    private void setCallDescriptionText() {
+        String callDescriptionWithoutTypeInfo =
+            String.format(
+                getResources().getString(R.string.nc_call_unknown),
+                getResources().getString(R.string.nc_app_product_name));
+
+        binding.incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);
     }
 
     private void showAnswerControls() {
-        callAnswerCameraView.setVisibility(View.VISIBLE);
+        binding.callAnswerCameraView.setVisibility(View.VISIBLE);
-        callAnswerVoiceOnlyView.setVisibility(View.VISIBLE);
+        binding.callAnswerVoiceOnlyView.setVisibility(View.VISIBLE);
     }
 
     @OnClick(R.id.hangupButton)
     void hangup() {
         leavingScreen = true;
-
+        finish();
-        if (getActivity() != null) {
-            getActivity().finish();
-        }
-    }
-
-    @OnClick(R.id.callAnswerCameraView)
-    void answerWithCamera() {
-        originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), false);
-        proceedToCall();
-    }
-
-    @OnClick(R.id.callAnswerVoiceOnlyView)
-    void answerVoiceOnly() {
-        originalBundle.putBoolean(BundleKeys.INSTANCE.getKEY_CALL_VOICE_ONLY(), true);
-        proceedToCall();
     }
 
     private void proceedToCall() {
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), currentConversation.getToken());
         originalBundle.putString(BundleKeys.INSTANCE.getKEY_CONVERSATION_NAME(), currentConversation.getDisplayName());
 
-//        getRouter().replaceTopController(RouterTransaction.with(new CallActivity(originalBundle))
+        Intent intent = new Intent(this, CallActivity.class);
-//                                                 .popChangeHandler(new HorizontalChangeHandler())
-//                                                 .pushChangeHandler(new HorizontalChangeHandler())
-//                                                 .tag(CallActivity.TAG));
-
-        Intent intent = new Intent(this.getActivity(), CallActivity.class);
         intent.putExtras(originalBundle);
         startActivity(intent);
     }
@@ -239,9 +242,7 @@ public class CallNotificationController extends BaseController {
                         }
 
                         if (!hasParticipantsInCall || inCallOnDifferentDevice) {
-                            if (getActivity() != null) {
+                            runOnUiThread(() -> hangup());
-                                getActivity().runOnUiThread(() -> hangup());
-                            }
                         }
                     }
 
@@ -285,11 +286,11 @@ public class CallNotificationController extends BaseController {
                                                                                 "conversation-call-flags");
                             if (hasCallFlags) {
                                 if (isInCallWithVideo(currentConversation.callFlag)) {
-                                    incomingCallVoiceOrVideoTextView.setText(
+                                    binding.incomingCallVoiceOrVideoTextView.setText(
                                             String.format(getResources().getString(R.string.nc_call_video),
                                                           getResources().getString(R.string.nc_app_product_name)));
                                 } else {
-                                    incomingCallVoiceOrVideoTextView.setText(
+                                    binding.incomingCallVoiceOrVideoTextView.setText(
                                             String.format(getResources().getString(R.string.nc_call_voice),
                                                           getResources().getString(R.string.nc_app_product_name)));
                                 }
@@ -316,9 +317,7 @@ public class CallNotificationController extends BaseController {
     }
 
     private void runAllThings() {
-        if (conversationNameTextView != null) {
+        binding.conversationNameTextView.setText(currentConversation.getDisplayName());
-            conversationNameTextView.setText(currentConversation.getDisplayName());
-        }
 
         // TODO: load avatar, but don't block UI!
 //        loadAvatar();
@@ -326,67 +325,21 @@ public class CallNotificationController extends BaseController {
         showAnswerControls();
     }
 
-    @SuppressLint({"LongLogTag"})
-    @Override
-    protected void onViewBound(@NonNull View view) {
-        super.onViewBound(view);
-
-        String callDescriptionWithoutTypeInfo =
-                String.format(
-                        getResources().getString(R.string.nc_call_unknown),
-                        getResources().getString(R.string.nc_app_product_name));
-
-        incomingCallVoiceOrVideoTextView.setText(callDescriptionWithoutTypeInfo);
-
-        renderScript = RenderScript.create(getActivity());
-
-        if (handler == null) {
-            handler = new Handler();
-
-            try {
-                cache.evictAll();
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to evict cache");
-            }
-        }
-
-        if (currentConversation == null) {
-            handleFromNotification();
-        } else {
-            runAllThings();
-        }
-
-        if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) {
-            playRingtoneSound();
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) {
-        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) avatarImageView.getLayoutParams();
+        ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) binding.avatarImageView.getLayoutParams();
         int dimen = (int) getResources().getDimension(R.dimen.avatar_size_very_big);
 
         layoutParams.width = dimen;
         layoutParams.height = dimen;
-        avatarImageView.setLayoutParams(layoutParams);
+        binding.avatarImageView.setLayoutParams(layoutParams);
     }
 
-    @Override
-    protected void onDetach(@NonNull View view) {
-        super.onDetach(view);
-        eventBus.unregister(this);
-    }
-
-    @Override
-    protected void onAttach(@NonNull View view) {
-        super.onAttach(view);
-        eventBus.register(this);
-    }
 
     private void loadAvatar() {
         switch (currentConversation.getType()) {
             case ROOM_TYPE_ONE_TO_ONE_CALL:
-                avatarImageView.setVisibility(View.VISIBLE);
+                binding.avatarImageView.setVisibility(View.VISIBLE);
 
                 ImageRequest imageRequest =
                         DisplayUtils.getImageRequestForUrl(
@@ -401,33 +354,30 @@ public class CallNotificationController extends BaseController {
                 dataSource.subscribe(new BaseBitmapDataSubscriber() {
                     @Override
                     protected void onNewResultImpl(@Nullable Bitmap bitmap) {
-                        if (avatarImageView != null) {
+                        binding.avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
-                            avatarImageView.getHierarchy().setImage(new BitmapDrawable(bitmap), 100,
+                                                                true);
-                                                                    true);
+                        if (getResources() != null) {
+                            binding.incomingTextRelativeLayout.setBackground(
+                                    getResources().getDrawable(R.drawable.incoming_gradient));
+                        }
 
-                            if (getResources() != null) {
+                        if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
-                                incomingTextRelativeLayout.setBackground(
+                                AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
-                                        getResources().getDrawable(R.drawable.incoming_gradient));
-                            }
 
-                            if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 ||
+                                Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                                    AvatarStatusCodeHolder.getInstance().getStatusCode() == 0) {
+                                new BlurPostProcessor(5, context).process(backgroundBitmap);
-                                if (getActivity() != null) {
+                                binding.backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
-                                    Bitmap backgroundBitmap = bitmap.copy(bitmap.getConfig(), true);
-                                    new BlurPostProcessor(5, getActivity()).process(backgroundBitmap);
-                                    backgroundImageView.setImageDrawable(new BitmapDrawable(backgroundBitmap));
-                                }
-                            } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                                ColorArt colorArt = new ColorArt(bitmap);
-                                int color = colorArt.getBackgroundColor();
 
-                                float[] hsv = new float[3];
+                        } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
-                                Color.colorToHSV(color, hsv);
+                            ColorArt colorArt = new ColorArt(bitmap);
-                                hsv[2] *= 0.75f;
+                            int color = colorArt.getBackgroundColor();
-                                color = Color.HSVToColor(hsv);
 
-                                backgroundImageView.setImageDrawable(new ColorDrawable(color));
+                            float[] hsv = new float[3];
-                            }
+                            Color.colorToHSV(color, hsv);
+                            hsv[2] *= 0.75f;
+                            color = Color.HSVToColor(hsv);
+
+                            binding.backgroundImageView.setImageDrawable(new ColorDrawable(color));
                         }
                     }
 
@@ -439,9 +389,9 @@ public class CallNotificationController extends BaseController {
 
                 break;
             case ROOM_GROUP_CALL:
-                avatarImageView.setImageResource(R.drawable.ic_circular_group);
+                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
             case ROOM_PUBLIC_CALL:
-                avatarImageView.setImageResource(R.drawable.ic_circular_group);
+                binding.avatarImageView.setImageResource(R.drawable.ic_circular_group);
                 break;
             default:
         }
@@ -502,10 +452,10 @@ public class CallNotificationController extends BaseController {
             }
         }
 
-        if (ringtoneUri != null && getActivity() != null) {
+        if (ringtoneUri != null) {
             mediaPlayer = new MediaPlayer();
             try {
-                mediaPlayer.setDataSource(getActivity(), ringtoneUri);
+                mediaPlayer.setDataSource(this, ringtoneUri);
 
                 mediaPlayer.setLooping(true);
                 AudioAttributes audioAttributes = new AudioAttributes

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

@@ -40,7 +40,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.talk.R
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
-import com.nextcloud.talk.controllers.CallNotificationController
 import com.nextcloud.talk.controllers.ConversationsListController
 import com.nextcloud.talk.controllers.LockedController
 import com.nextcloud.talk.controllers.ServerSelectionController
@@ -310,11 +309,17 @@ class MainActivity : BaseActivity(), ActionBarProvider {
         handleActionFromContact(intent)
         if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
             if (intent.getBooleanExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL, false)) {
-                router!!.pushController(
+
-                    RouterTransaction.with(CallNotificationController(intent.extras))
+                // router!!.pushController(
-                        .pushChangeHandler(HorizontalChangeHandler())
+                //     RouterTransaction.with(CallNotificationController(intent.extras))
-                        .popChangeHandler(HorizontalChangeHandler())
+                //         .pushChangeHandler(HorizontalChangeHandler())
-                )
+                //         .popChangeHandler(HorizontalChangeHandler())
+                // )
+
+                val callNotificationIntent = Intent(this, CallNotificationActivity::class.java)
+                intent.extras?.let { callNotificationIntent.putExtras(it) }
+                startActivity(callNotificationIntent)
+
             } else {
                 ConductorRemapping.remapChatController(
                     router!!, intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1),