do not reset values for incoming call. solves #572

zoff99 · zoff99 · commit acce49d31719 · 2025-01-01T17:16:19.000+01:00
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/CallingActivity.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/CallingActivity.java
@@ -19,6 +19,7 @@
 
 package com.zoffcc.applications.trifa;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.KeyguardManager;
@@ -1256,43 +1257,53 @@ public void run()
             @Override
             public boolean onTouch(View v, MotionEvent event)
             {
+                Log.i(TAG, "accept_button:onTouch:001");
                 try
                 {
                     if (event.getAction() != MotionEvent.ACTION_UP)
                     {
+                        Log.i(TAG, "accept_button:onTouch:002");
                     }
                     else
                     {
+                        Log.i(TAG, "accept_button:onTouch:003 " + Callstate.accepted_call + " " + Callstate.friend_pubkey);
                         if (Callstate.accepted_call != 1)
                         {
                             Log.i(TAG, "answer button pressed");
+                            Log.i(TAG, "accept_button:onTouch:004 " + Callstate.audio_call);
 
                             if (Callstate.audio_call)
                             {
                                 int res1 = toxav_answer(tox_friend_by_public_key__wrapper(Callstate.friend_pubkey),
                                                         GLOBAL_AUDIO_BITRATE, 0);
 
+                                Log.i(TAG, "accept_button:onTouch:004:001" + res1);
                                 if (res1 != 1)
                                 {
+                                    Log.i(TAG, "accept_button:onTouch:004:002");
                                     return true;
                                 }
                                 Callstate.tox_call_state = ToxVars.TOXAV_FRIEND_CALL_STATE.TOXAV_FRIEND_CALL_STATE_SENDING_V.value;
+                                Log.i(TAG, "accept_button:onTouch:004:003");
                             }
                             else
                             {
                                 int res2 = toxav_answer(tox_friend_by_public_key__wrapper(Callstate.friend_pubkey),
                                                         GLOBAL_AUDIO_BITRATE, GLOBAL_VIDEO_BITRATE);
+                                Log.i(TAG, "accept_button:onTouch:004:011: " + res2);
 
                                 if (res2 != 1)
                                 {
+                                    Log.i(TAG, "accept_button:onTouch:004:012");
                                     return true;
                                 }
 
                                 Callstate.tox_call_state = ToxVars.TOXAV_FRIEND_CALL_STATE.TOXAV_FRIEND_CALL_STATE_SENDING_V.value;
-
+                                Log.i(TAG, "accept_button:onTouch:004:014");
                             }
 
                             Callstate.accepted_call = 1;
+                            Log.i(TAG, "accept_button:onTouch:005");
 
                             caller_avatar_view.setVisibility(View.GONE);
                             accept_button.setVisibility(View.GONE);
@@ -1308,8 +1319,12 @@ public boolean onTouch(View v, MotionEvent event)
 
                             Log.i(TAG, "on_call_started_actions:01");
                             on_call_started_actions();
+                            Log.i(TAG, "accept_button:onTouch:006");
+
                             if (Callstate.audio_call)
                             {
+                                Log.i(TAG, "accept_button:onTouch:006 " + Callstate.audio_call);
+
                                 toggle_osd_view_including_cam_preview(!Callstate.audio_call);
                             }
 
@@ -1319,6 +1334,7 @@ public boolean onTouch(View v, MotionEvent event)
                 catch (Exception e)
                 {
                     e.printStackTrace();
+                    Log.i(TAG, "accept_button:onTouch:006:EE01:" + e.getMessage());
                 }
                 return true;
             }
@@ -1447,6 +1463,7 @@ else if (PREF__video_cam_resolution == 1)
 
     public static void close_calling_activity()
     {
+        Log.i(TAG, "reset_values:001");
         Callstate.reset_values();
         // close calling activity --------
         ca.finish();
@@ -1582,6 +1599,7 @@ public static void initializeScreenshotSecurity(Activity a)
         }
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     public void onBackPressed()
     {
@@ -1602,6 +1620,7 @@ protected void onResume()
         super.onResume();
 
         tox_set_onion_active(0);
+        Callstate.incoming_one_on_one_call = false;
 
         try
         {
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/Callstate.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/Callstate.java
@@ -22,6 +22,7 @@
 
 import android.provider.CallLog;
 import android.telecom.Call;
+import android.util.Log;
 
 import static com.zoffcc.applications.trifa.CallingActivity.set_debug_text;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.GLOBAL_AUDIO_BITRATE;
@@ -31,10 +32,13 @@
 
 public class Callstate
 {
+    private static final String TAG = "trifa.Callstate";
+
     static int state = 0; // 0 -> not in a call, 1 -> ringing/calling
     static int tox_call_state = ToxVars.TOXAV_FRIEND_CALL_STATE.TOXAV_FRIEND_CALL_STATE_NONE.value;
     static boolean audio_call = false;
     static String friend_pubkey = "-1";
+    static boolean incoming_one_on_one_call = false;
     static String friend_alias_name = "";
     static int other_audio_enabled = 1;
     static int other_video_enabled = 1;
@@ -79,7 +83,9 @@ static void reset_values()
         Callstate.call_first_audio_frame_received = -1;
         Callstate.call_start_timestamp = -1;
         Callstate.call_init_timestamp = -1;
+        Log.i(TAG, "friend_pubkey:set:001");
         Callstate.friend_pubkey = "-1";
+        Callstate.incoming_one_on_one_call = false;
         Callstate.friend_alias_name = "";
         Callstate.other_audio_enabled = 1;
         Callstate.other_video_enabled = 1;
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/ConfGroupAudioService.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/ConfGroupAudioService.java
@@ -538,6 +538,7 @@ public static void stop_me(boolean stop_full)
         Callstate.audio_group_active = false;
         if (stop_full)
         {
+            Log.i(TAG, "reset_values:003");
             Callstate.reset_values();
         }
         ConferenceAudioActivity.conf_id = "-1";
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/ConferenceAudioActivity.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/ConferenceAudioActivity.java
@@ -1489,6 +1489,7 @@ static void on_groupaudio_ended_actions(boolean close)
 
     public static void close_conference_audio_activity()
     {
+        Log.i(TAG, "reset_values:002");
         Callstate.reset_values();
         conf_id = "-1";
         conf_id_prev = "-1";
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/GroupGroupAudioService.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/GroupGroupAudioService.java
@@ -474,7 +474,7 @@ private static void removeNotification()
         }
     }
 
-    public static void stop_me(boolean stop_full)
+    public static void stop_me(boolean stop_full, boolean reset_call_values)
     {
         ngc_running = false;
         try
@@ -493,7 +493,11 @@ public static void stop_me(boolean stop_full)
         Callstate.audio_ngc_group_active = false;
         if (stop_full)
         {
-            Callstate.reset_values();
+            if (reset_call_values)
+            {
+                Log.i(TAG, "reset_values:004");
+                Callstate.reset_values();
+            }
         }
         GroupGroupAudioService.group_id = "-1";
         AudioRecording.global_audio_group_send_res = -999;
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/GroupMessageListActivity.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/GroupMessageListActivity.java
@@ -1655,7 +1655,10 @@ protected void onPause()
         ml_is_recording = false;
         ml_is_rec_ok = false;
 
-        stop_group_video(this);
+        // HINT: here we leave the GroupMessageListActivity
+        //       but it could be that we are starting the CallingActivity because there is an icoming call
+        //       then this would reset the values for the incoming call :-(
+        stop_group_video(this, !Callstate.incoming_one_on_one_call);
         closeCamera();
         MainActivity.group_message_list_fragment = null;
         MainActivity.group_message_list_activity = null;
@@ -1708,7 +1711,7 @@ protected void onResume()
         // reset update trigger timestamp
         update_group_all_users_last_trigger_ts = 0;
 
-        stop_group_video(this);
+        stop_group_video(this, true);
         closeCamera();
         ngc_video_packet_last_incoming_ts = -1;
         ngc_incoming_video_peer_toggle_current_index = 0;
@@ -3097,7 +3100,7 @@ private Size chooseOptimalSize(Size[] choices, int width, int height) {
         }
     }
 
-    synchronized public static void stop_group_video(final Context c)
+    synchronized public static void stop_group_video(final Context c, boolean reset_call_values)
     {
         ngc_video_showing_video_from_peer_pubkey = "-1";
         NGC_Group_video_play_thread_running = false;
@@ -3109,7 +3112,7 @@ synchronized public static void stop_group_video(final Context c)
         // ---- stop audio stuff
         try
         {
-            GroupGroupAudioService.stop_me(true);
+            GroupGroupAudioService.stop_me(true, reset_call_values);
         }
         catch (Exception e)
         {
@@ -3851,7 +3854,7 @@ public void toggle_group_video(final View view)
     {
         if (sending_video_to_group)
         {
-            stop_group_video(view.getContext());
+            stop_group_video(view.getContext(), true);
             closeCamera();
         }
         else
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MainActivity.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MainActivity.java
@@ -1729,6 +1729,7 @@ else if (position == 10)
         last_video_frame_received = -1;
         count_video_frame_received = 0;
         count_video_frame_sent = 0;
+        Log.i(TAG, "friend_pubkey:set:002");
         Callstate.friend_pubkey = "-1";
         Callstate.audio_speaker = true;
         Callstate.other_audio_enabled = 1;
@@ -3750,6 +3751,7 @@ public void run()
                         }
 
                         Callstate.state = 1;
+                        Callstate.incoming_one_on_one_call = true;
                         Callstate.accepted_call = 0;
                         Callstate.call_first_video_frame_received = -1;
                         Callstate.call_first_audio_frame_received = -1;
@@ -3775,6 +3777,7 @@ public void run()
                         {
                         }
                         Intent intent = new Intent(context_s.getApplicationContext(), CallingActivity.class);
+                        Log.i(TAG, "friend_pubkey:set:003");
                         Callstate.friend_pubkey = HelperFriend.tox_friend_get_public_key__wrapper(fn);
                         Callstate.friend_alias_name = get_friend_name_from_pubkey(Callstate.friend_pubkey);
                         Callstate.other_audio_enabled = f_audio_enabled;
diff --git a/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MessageListActivity.java b/android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MessageListActivity.java
@@ -2023,6 +2023,7 @@ public void run()
                         Callstate.accepted_call = 1; // we started the call, so it's already accepted on our side
                         Callstate.call_first_video_frame_received = -1;
                         Callstate.call_start_timestamp = -1;
+                        Log.i(TAG, "friend_pubkey:set:004");
                         Callstate.friend_pubkey = tox_friend_get_public_key__wrapper(fn);
                         Callstate.camera_opened = false;
                         Callstate.audio_speaker = true;

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`package com.zoffcc.applications.trifa;`
`21`	`21`
	`22`	`+import android.annotation.SuppressLint;`
`22`	`23`	`import android.annotation.TargetApi;`
`23`	`24`	`import android.app.Activity;`
`24`	`25`	`import android.app.KeyguardManager;`
`@@ -1256,43 +1257,53 @@ public void run()`
`1256`	`1257`	`@Override`
`1257`	`1258`	`public boolean onTouch(View v, MotionEvent event)`
`1258`	`1259`	`{`
	`1260`	`+ Log.i(TAG, "accept_button:onTouch:001");`
`1259`	`1261`	`try`
`1260`	`1262`	`{`
`1261`	`1263`	`if (event.getAction() != MotionEvent.ACTION_UP)`
`1262`	`1264`	`{`
	`1265`	`+ Log.i(TAG, "accept_button:onTouch:002");`
`1263`	`1266`	`}`
`1264`	`1267`	`else`
`1265`	`1268`	`{`
	`1269`	`+ Log.i(TAG, "accept_button:onTouch:003 " + Callstate.accepted_call + " " + Callstate.friend_pubkey);`
`1266`	`1270`	`if (Callstate.accepted_call != 1)`
`1267`	`1271`	`{`
`1268`	`1272`	`Log.i(TAG, "answer button pressed");`
	`1273`	`+ Log.i(TAG, "accept_button:onTouch:004 " + Callstate.audio_call);`
`1269`	`1274`
`1270`	`1275`	`if (Callstate.audio_call)`
`1271`	`1276`	`{`
`1272`	`1277`	`int res1 = toxav_answer(tox_friend_by_public_key__wrapper(Callstate.friend_pubkey),`
`1273`	`1278`	`GLOBAL_AUDIO_BITRATE, 0);`
`1274`	`1279`
	`1280`	`+ Log.i(TAG, "accept_button:onTouch:004:001" + res1);`
`1275`	`1281`	`if (res1 != 1)`
`1276`	`1282`	`{`
	`1283`	`+ Log.i(TAG, "accept_button:onTouch:004:002");`
`1277`	`1284`	`return true;`
`1278`	`1285`	`}`
`1279`	`1286`	`Callstate.tox_call_state = ToxVars.TOXAV_FRIEND_CALL_STATE.TOXAV_FRIEND_CALL_STATE_SENDING_V.value;`
	`1287`	`+ Log.i(TAG, "accept_button:onTouch:004:003");`
`1280`	`1288`	`}`
`1281`	`1289`	`else`
`1282`	`1290`	`{`
`1283`	`1291`	`int res2 = toxav_answer(tox_friend_by_public_key__wrapper(Callstate.friend_pubkey),`
`1284`	`1292`	`GLOBAL_AUDIO_BITRATE, GLOBAL_VIDEO_BITRATE);`
	`1293`	`+ Log.i(TAG, "accept_button:onTouch:004:011: " + res2);`
`1285`	`1294`
`1286`	`1295`	`if (res2 != 1)`
`1287`	`1296`	`{`
	`1297`	`+ Log.i(TAG, "accept_button:onTouch:004:012");`
`1288`	`1298`	`return true;`
`1289`	`1299`	`}`
`1290`	`1300`
`1291`	`1301`	`Callstate.tox_call_state = ToxVars.TOXAV_FRIEND_CALL_STATE.TOXAV_FRIEND_CALL_STATE_SENDING_V.value;`
`1292`		`-`
	`1302`	`+ Log.i(TAG, "accept_button:onTouch:004:014");`
`1293`	`1303`	`}`
`1294`	`1304`
`1295`	`1305`	`Callstate.accepted_call = 1;`
	`1306`	`+ Log.i(TAG, "accept_button:onTouch:005");`
`1296`	`1307`
`1297`	`1308`	`caller_avatar_view.setVisibility(View.GONE);`
`1298`	`1309`	`accept_button.setVisibility(View.GONE);`
`@@ -1308,8 +1319,12 @@ public boolean onTouch(View v, MotionEvent event)`
`1308`	`1319`
`1309`	`1320`	`Log.i(TAG, "on_call_started_actions:01");`
`1310`	`1321`	`on_call_started_actions();`
	`1322`	`+ Log.i(TAG, "accept_button:onTouch:006");`
	`1323`	`+`
`1311`	`1324`	`if (Callstate.audio_call)`
`1312`	`1325`	`{`
	`1326`	`+ Log.i(TAG, "accept_button:onTouch:006 " + Callstate.audio_call);`
	`1327`	`+`
`1313`	`1328`	`toggle_osd_view_including_cam_preview(!Callstate.audio_call);`
`1314`	`1329`	`}`
`1315`	`1330`
`@@ -1319,6 +1334,7 @@ public boolean onTouch(View v, MotionEvent event)`
`1319`	`1334`	`catch (Exception e)`
`1320`	`1335`	`{`
`1321`	`1336`	`e.printStackTrace();`
	`1337`	`+ Log.i(TAG, "accept_button:onTouch:006:EE01:" + e.getMessage());`
`1322`	`1338`	`}`
`1323`	`1339`	`return true;`
`1324`	`1340`	`}`
`@@ -1447,6 +1463,7 @@ else if (PREF__video_cam_resolution == 1)`
`1447`	`1463`
`1448`	`1464`	`public static void close_calling_activity()`
`1449`	`1465`	`{`
	`1466`	`+ Log.i(TAG, "reset_values:001");`
`1450`	`1467`	`Callstate.reset_values();`
`1451`	`1468`	`// close calling activity --------`
`1452`	`1469`	`ca.finish();`
`@@ -1582,6 +1599,7 @@ public static void initializeScreenshotSecurity(Activity a)`
`1582`	`1599`	`}`
`1583`	`1600`	`}`
`1584`	`1601`
	`1602`	`+ @SuppressLint("MissingSuperCall")`
`1585`	`1603`	`@Override`
`1586`	`1604`	`public void onBackPressed()`
`1587`	`1605`	`{`
`@@ -1602,6 +1620,7 @@ protected void onResume()`
`1602`	`1620`	`super.onResume();`
`1603`	`1621`
`1604`	`1622`	`tox_set_onion_active(0);`
	`1623`	`+ Callstate.incoming_one_on_one_call = false;`
`1605`	`1624`
`1606`	`1625`	`try`
`1607`	`1626`	`{`
Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,7 @@ public static void stop_me(boolean stop_full)`
`538`	`538`	`Callstate.audio_group_active = false;`
`539`	`539`	`if (stop_full)`
`540`	`540`	`{`
	`541`	`+ Log.i(TAG, "reset_values:003");`
`541`	`542`	`Callstate.reset_values();`
`542`	`543`	`}`
`543`	`544`	`ConferenceAudioActivity.conf_id = "-1";`
Original file line number	Diff line number	Diff line change
`@@ -1489,6 +1489,7 @@ static void on_groupaudio_ended_actions(boolean close)`
`1489`	`1489`
`1490`	`1490`	`public static void close_conference_audio_activity()`
`1491`	`1491`	`{`
	`1492`	`+ Log.i(TAG, "reset_values:002");`
`1492`	`1493`	`Callstate.reset_values();`
`1493`	`1494`	`conf_id = "-1";`
`1494`	`1495`	`conf_id_prev = "-1";`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ private static void removeNotification()`
`474`	`474`	`}`
`475`	`475`	`}`
`476`	`476`
`477`		`- public static void stop_me(boolean stop_full)`
	`477`	`+ public static void stop_me(boolean stop_full, boolean reset_call_values)`
`478`	`478`	`{`
`479`	`479`	`ngc_running = false;`
`480`	`480`	`try`
`@@ -493,7 +493,11 @@ public static void stop_me(boolean stop_full)`
`493`	`493`	`Callstate.audio_ngc_group_active = false;`
`494`	`494`	`if (stop_full)`
`495`	`495`	`{`
`496`		`- Callstate.reset_values();`
	`496`	`+ if (reset_call_values)`
	`497`	`+ {`
	`498`	`+ Log.i(TAG, "reset_values:004");`
	`499`	`+ Callstate.reset_values();`
	`500`	`+ }`
`497`	`501`	`}`
`498`	`502`	`GroupGroupAudioService.group_id = "-1";`
`499`	`503`	`AudioRecording.global_audio_group_send_res = -999;`
Original file line number	Diff line number	Diff line change
`@@ -1655,7 +1655,10 @@ protected void onPause()`
`1655`	`1655`	`ml_is_recording = false;`
`1656`	`1656`	`ml_is_rec_ok = false;`
`1657`	`1657`
`1658`		`- stop_group_video(this);`
	`1658`	`+ // HINT: here we leave the GroupMessageListActivity`
	`1659`	`+ // but it could be that we are starting the CallingActivity because there is an icoming call`
	`1660`	`+ // then this would reset the values for the incoming call :-(`
	`1661`	`+ stop_group_video(this, !Callstate.incoming_one_on_one_call);`
`1659`	`1662`	`closeCamera();`
`1660`	`1663`	`MainActivity.group_message_list_fragment = null;`
`1661`	`1664`	`MainActivity.group_message_list_activity = null;`
`@@ -1708,7 +1711,7 @@ protected void onResume()`
`1708`	`1711`	`// reset update trigger timestamp`
`1709`	`1712`	`update_group_all_users_last_trigger_ts = 0;`
`1710`	`1713`
`1711`		`- stop_group_video(this);`
	`1714`	`+ stop_group_video(this, true);`
`1712`	`1715`	`closeCamera();`
`1713`	`1716`	`ngc_video_packet_last_incoming_ts = -1;`
`1714`	`1717`	`ngc_incoming_video_peer_toggle_current_index = 0;`
`@@ -3097,7 +3100,7 @@ private Size chooseOptimalSize(Size[] choices, int width, int height) {`
`3097`	`3100`	`}`
`3098`	`3101`	`}`
`3099`	`3102`
`3100`		`- synchronized public static void stop_group_video(final Context c)`
	`3103`	`+ synchronized public static void stop_group_video(final Context c, boolean reset_call_values)`
`3101`	`3104`	`{`
`3102`	`3105`	`ngc_video_showing_video_from_peer_pubkey = "-1";`
`3103`	`3106`	`NGC_Group_video_play_thread_running = false;`
`@@ -3109,7 +3112,7 @@ synchronized public static void stop_group_video(final Context c)`
`3109`	`3112`	`// ---- stop audio stuff`
`3110`	`3113`	`try`
`3111`	`3114`	`{`
`3112`		`- GroupGroupAudioService.stop_me(true);`
	`3115`	`+ GroupGroupAudioService.stop_me(true, reset_call_values);`
`3113`	`3116`	`}`
`3114`	`3117`	`catch (Exception e)`
`3115`	`3118`	`{`
`@@ -3851,7 +3854,7 @@ public void toggle_group_video(final View view)`
`3851`	`3854`	`{`
`3852`	`3855`	`if (sending_video_to_group)`
`3853`	`3856`	`{`
`3854`		`- stop_group_video(view.getContext());`
	`3857`	`+ stop_group_video(view.getContext(), true);`
`3855`	`3858`	`closeCamera();`
`3856`	`3859`	`}`
`3857`	`3860`	`else`