Couple rare crashes due to data races

tinode · Dec 15, 2023 · 6e37c29 · 6e37c29
1 parent 8f9706e
commit 6e37c29
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git a/app/src/main/java/co/tinode/tindroid/CallFragment.java b/app/src/main/java/co/tinode/tindroid/CallFragment.java
@@ -959,6 +959,9 @@ private synchronized void stopSoundEffect() {
 
     private void rearrangePeerViews(final Activity activity, boolean remoteVideoLive) {
         activity.runOnUiThread(() -> {
+            if (activity.isFinishing() || activity.isDestroyed()) {
+                return;
+            }
             if (remoteVideoLive) {
                 ConstraintSet cs = new ConstraintSet();
                 cs.clone(mLayout);
@@ -979,7 +982,9 @@ private void rearrangePeerViews(final Activity activity, boolean remoteVideoLive
                 cs.setHorizontalBias(R.id.peerName, 0.5f);
                 cs.applyTo(mLayout);
                 mPeerAvatar.setVisibility(View.VISIBLE);
-                mRemoteVideoView.setVisibility(View.INVISIBLE);
+                if (mRemoteVideoView != null) {
+                    mRemoteVideoView.setVisibility(View.INVISIBLE);
+                }
             }
         });
     }

diff --git a/app/src/main/java/co/tinode/tindroid/TopicInfoFragment.java b/app/src/main/java/co/tinode/tindroid/TopicInfoFragment.java
@@ -109,30 +109,38 @@ public void onViewCreated(@NonNull View view, Bundle savedInstance) {
         // Set up listeners
 
         final SwitchCompat muted = view.findViewById(R.id.switchMuted);
-        muted.setOnCheckedChangeListener((buttonView, isChecked) ->
-                mTopic.updateMuted(isChecked).thenCatch(new PromisedReply.FailureListener<ServerMessage>() {
-                    @Override
-                    public <E extends Exception> PromisedReply<ServerMessage> onFailure(E err) {
-                        activity.runOnUiThread(() -> muted.setChecked(!isChecked));
-                        if (err instanceof NotConnectedException) {
-                            Toast.makeText(activity, R.string.no_connection, Toast.LENGTH_SHORT).show();
-                        }
-                        return null;
+        muted.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (mTopic == null) {
+                return;
+            }
+            mTopic.updateMuted(isChecked).thenCatch(new PromisedReply.FailureListener<ServerMessage>() {
+                @Override
+                public <E extends Exception> PromisedReply<ServerMessage> onFailure(E err) {
+                    activity.runOnUiThread(() -> muted.setChecked(!isChecked));
+                    if (err instanceof NotConnectedException) {
+                        Toast.makeText(activity, R.string.no_connection, Toast.LENGTH_SHORT).show();
                     }
-                }));
+                    return null;
+                }
+            });
+        });
 
         final SwitchCompat archived = view.findViewById(R.id.switchArchived);
-        archived.setOnCheckedChangeListener((buttonView, isChecked) ->
-                mTopic.updateArchived(isChecked).thenCatch(new PromisedReply.FailureListener<ServerMessage>() {
-                    @Override
-                    public <E extends Exception> PromisedReply<ServerMessage> onFailure(E err) {
-                        activity.runOnUiThread(() -> archived.setChecked(!isChecked));
-                        if (err instanceof NotConnectedException) {
-                            Toast.makeText(activity, R.string.no_connection, Toast.LENGTH_SHORT).show();
-                        }
-                        return null;
+        archived.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (mTopic == null) {
+                return;
+            }
+            mTopic.updateArchived(isChecked).thenCatch(new PromisedReply.FailureListener<ServerMessage>() {
+                @Override
+                public <E extends Exception> PromisedReply<ServerMessage> onFailure(E err) {
+                    activity.runOnUiThread(() -> archived.setChecked(!isChecked));
+                    if (err instanceof NotConnectedException) {
+                        Toast.makeText(activity, R.string.no_connection, Toast.LENGTH_SHORT).show();
                     }
-                }));
+                    return null;
+                }
+            });
+        });
 
         view.findViewById(R.id.buttonCopyID).setOnClickListener(v -> {
             ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);