From 4d248945077bcbd1b0eefaf68ae278e4214f00c3 Mon Sep 17 00:00:00 2001
From: SteveJosephh21 <steve.josephh@beldex.io>
Date: Mon, 27 May 2024 12:27:51 +0530
Subject: [PATCH] Updated version 2.5.1

---
 app/build.gradle                              |  10 +-
 app/playMainNet/release/output-metadata.json  |  24 +--
 app/src/main/assets/changeLog.json            |   8 +
 .../contactshare/ContactModelMapper.java      | 169 ------------------
 .../conversation/v2/ConversationFragmentV2.kt | 140 ++++++++-------
 .../v2/menus/ConversationMenuHelper.kt        | 151 ++++------------
 .../securesms/service/WebRtcCallService.kt    |  39 ++--
 .../securesms/util/RestoreHeight.java         |   2 +
 .../securesms/webrtc/CallManager.kt           |  50 +-----
 .../webrtc/WebRtcCallServiceReceivers.kt      |   5 +-
 app/src/main/res/layout/fragment_home.xml     |   2 +-
 11 files changed, 170 insertions(+), 430 deletions(-)
 delete mode 100644 app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java

diff --git a/app/build.gradle b/app/build.gradle
index 1fbdc685..af54ff12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ apply from: 'buildGradle/dependencies.gradle'
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 44
-def canonicalVersionName = "2.5.0"
+def canonicalVersionCode = 46
+def canonicalVersionName = "2.5.1"
 
 //First Release Date 17-06-2022
 //Version Code 15 Version Name 1.0.0
@@ -104,6 +104,12 @@ def canonicalVersionName = "2.5.0"
 //30th  Release Data 22-03-2024
 //Version code 44 Version Name 2.5.0
 
+//31th Internal Test Release Data 22-03-2024
+//Version code 45 Version Name 2.5.0
+
+//32 Internal Test Release Data 27-05-2024
+//Version code 46 Version Name 2.5.1
+
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
                   'arm64-v8a'   : 2,
diff --git a/app/playMainNet/release/output-metadata.json b/app/playMainNet/release/output-metadata.json
index a17e2c5c..cc4c8e90 100644
--- a/app/playMainNet/release/output-metadata.json
+++ b/app/playMainNet/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-universal.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-universal.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -24,9 +24,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-armeabi-v7a.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-armeabi-v7a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -37,9 +37,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-x86_64.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -50,9 +50,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-arm64-v8a.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-arm64-v8a.apk"
     }
   ],
   "elementType": "File"
diff --git a/app/src/main/assets/changeLog.json b/app/src/main/assets/changeLog.json
index c8b69b79..d39fa760 100644
--- a/app/src/main/assets/changeLog.json
+++ b/app/src/main/assets/changeLog.json
@@ -363,6 +363,14 @@
           "description":"- Minor Bug fixes"
         }
       ]
+    },
+    {
+      "title": "2.5.1",
+      "descriptions": [
+        {
+          "description":"- Updated call functionalities to adhere with google play's developer guidelines"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java
deleted file mode 100644
index 4c7d1377..00000000
--- a/app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.thoughtcrimes.securesms.contactshare;
-
-import androidx.annotation.NonNull;
-
-import com.beldex.libbchat.messaging.sending_receiving.attachments.Attachment;
-import com.beldex.libbchat.messaging.sending_receiving.attachments.PointerAttachment;
-import com.beldex.libsignal.utilities.guava.Optional;
-import com.beldex.libsignal.messages.SharedContact;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.beldex.libbchat.utilities.Contact;
-import static com.beldex.libbchat.utilities.Contact.*;
-
-public class ContactModelMapper {
-
-  public static SharedContact.Builder localToRemoteBuilder(@NonNull Contact contact) {
-    List<SharedContact.Phone>         phoneNumbers    = new ArrayList<>(contact.getPhoneNumbers().size());
-    List<SharedContact.Email>         emails          = new ArrayList<>(contact.getEmails().size());
-    List<SharedContact.PostalAddress> postalAddresses = new ArrayList<>(contact.getPostalAddresses().size());
-
-    for (Phone phone : contact.getPhoneNumbers()) {
-      phoneNumbers.add(new SharedContact.Phone.Builder().setValue(phone.getNumber())
-                                                        .setType(localToRemoteType(phone.getType()))
-                                                        .setLabel(phone.getLabel())
-                                                        .build());
-    }
-
-    for (Email email : contact.getEmails()) {
-      emails.add(new SharedContact.Email.Builder().setValue(email.getEmail())
-                                                  .setType(localToRemoteType(email.getType()))
-                                                  .setLabel(email.getLabel())
-                                                  .build());
-    }
-
-    for (PostalAddress postalAddress : contact.getPostalAddresses()) {
-      postalAddresses.add(new SharedContact.PostalAddress.Builder().setType(localToRemoteType(postalAddress.getType()))
-                                                                   .setLabel(postalAddress.getLabel())
-                                                                   .setStreet(postalAddress.getStreet())
-                                                                   .setPobox(postalAddress.getPoBox())
-                                                                   .setNeighborhood(postalAddress.getNeighborhood())
-                                                                   .setCity(postalAddress.getCity())
-                                                                   .setRegion(postalAddress.getRegion())
-                                                                   .setPostcode(postalAddress.getPostalCode())
-                                                                   .setCountry(postalAddress.getCountry())
-                                                                   .build());
-    }
-
-    SharedContact.Name name = new SharedContact.Name.Builder().setDisplay(contact.getName().getDisplayName())
-                                                              .setGiven(contact.getName().getGivenName())
-                                                              .setFamily(contact.getName().getFamilyName())
-                                                              .setPrefix(contact.getName().getPrefix())
-                                                              .setSuffix(contact.getName().getSuffix())
-                                                              .setMiddle(contact.getName().getMiddleName())
-                                                              .build();
-
-    return new SharedContact.Builder().setName(name)
-                                      .withOrganization(contact.getOrganization())
-                                      .withPhones(phoneNumbers)
-                                      .withEmails(emails)
-                                      .withAddresses(postalAddresses);
-  }
-
-  public static Contact remoteToLocal(@NonNull SharedContact sharedContact) {
-    Name name = new Name(sharedContact.getName().getDisplay().orNull(),
-        sharedContact.getName().getGiven().orNull(),
-        sharedContact.getName().getFamily().orNull(),
-        sharedContact.getName().getPrefix().orNull(),
-        sharedContact.getName().getSuffix().orNull(),
-        sharedContact.getName().getMiddle().orNull());
-
-    List<Phone> phoneNumbers = new LinkedList<>();
-    if (sharedContact.getPhone().isPresent()) {
-      for (SharedContact.Phone phone : sharedContact.getPhone().get()) {
-        phoneNumbers.add(new Phone(phone.getValue(),
-                                   remoteToLocalType(phone.getType()),
-                                   phone.getLabel().orNull()));
-      }
-    }
-
-    List<Email> emails = new LinkedList<>();
-    if (sharedContact.getEmail().isPresent()) {
-      for (SharedContact.Email email : sharedContact.getEmail().get()) {
-        emails.add(new Email(email.getValue(),
-                             remoteToLocalType(email.getType()),
-                             email.getLabel().orNull()));
-      }
-    }
-
-    List<PostalAddress> postalAddresses = new LinkedList<>();
-    if (sharedContact.getAddress().isPresent()) {
-      for (SharedContact.PostalAddress postalAddress : sharedContact.getAddress().get()) {
-        postalAddresses.add(new PostalAddress(remoteToLocalType(postalAddress.getType()),
-                                              postalAddress.getLabel().orNull(),
-                                              postalAddress.getStreet().orNull(),
-                                              postalAddress.getPobox().orNull(),
-                                              postalAddress.getNeighborhood().orNull(),
-                                              postalAddress.getCity().orNull(),
-                                              postalAddress.getRegion().orNull(),
-                                              postalAddress.getPostcode().orNull(),
-                                              postalAddress.getCountry().orNull()));
-      }
-    }
-
-    Avatar avatar = null;
-    if (sharedContact.getAvatar().isPresent()) {
-      Attachment attachment = PointerAttachment.forPointer(Optional.of(sharedContact.getAvatar().get().getAttachment().asPointer())).get();
-      boolean    isProfile  = sharedContact.getAvatar().get().isProfile();
-
-      avatar = new Avatar(null, attachment, isProfile);
-    }
-
-    return new Contact(name, sharedContact.getOrganization().orNull(), phoneNumbers, emails, postalAddresses, avatar);
-  }
-
-  private static Phone.Type remoteToLocalType(SharedContact.Phone.Type type) {
-    switch (type) {
-      case HOME:   return Phone.Type.HOME;
-      case MOBILE: return Phone.Type.MOBILE;
-      case WORK:   return Phone.Type.WORK;
-      default:     return Phone.Type.CUSTOM;
-    }
-  }
-
-  private static Email.Type remoteToLocalType(SharedContact.Email.Type type) {
-    switch (type) {
-      case HOME:   return Email.Type.HOME;
-      case MOBILE: return Email.Type.MOBILE;
-      case WORK:   return Email.Type.WORK;
-      default:     return Email.Type.CUSTOM;
-    }
-  }
-
-  private static PostalAddress.Type remoteToLocalType(SharedContact.PostalAddress.Type type) {
-    switch (type) {
-      case HOME:   return PostalAddress.Type.HOME;
-      case WORK:   return PostalAddress.Type.WORK;
-      default:     return PostalAddress.Type.CUSTOM;
-    }
-  }
-
-  private static SharedContact.Phone.Type localToRemoteType(Phone.Type type) {
-    switch (type) {
-      case HOME:   return SharedContact.Phone.Type.HOME;
-      case MOBILE: return SharedContact.Phone.Type.MOBILE;
-      case WORK:   return SharedContact.Phone.Type.WORK;
-      default:     return SharedContact.Phone.Type.CUSTOM;
-    }
-  }
-
-  private static SharedContact.Email.Type localToRemoteType(Email.Type type) {
-    switch (type) {
-      case HOME:   return SharedContact.Email.Type.HOME;
-      case MOBILE: return SharedContact.Email.Type.MOBILE;
-      case WORK:   return SharedContact.Email.Type.WORK;
-      default:     return SharedContact.Email.Type.CUSTOM;
-    }
-  }
-
-  private static SharedContact.PostalAddress.Type localToRemoteType(PostalAddress.Type type) {
-    switch (type) {
-      case HOME: return SharedContact.PostalAddress.Type.HOME;
-      case WORK: return SharedContact.PostalAddress.Type.WORK;
-      default:   return SharedContact.PostalAddress.Type.CUSTOM;
-    }
-  }
-}
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/ConversationFragmentV2.kt b/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/ConversationFragmentV2.kt
index 2009d7f6..4fb2ec89 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/ConversationFragmentV2.kt
+++ b/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/ConversationFragmentV2.kt
@@ -32,6 +32,7 @@ import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.TextUtils
 import android.text.style.ForegroundColorSpan
+import android.util.Log
 import android.util.Pair
 import android.util.TypedValue
 import android.view.ActionMode
@@ -224,7 +225,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
         )[LinkPreviewViewModel::class.java]
     }
 
-//    var threadId: Long? = -1L
+    //    var threadId: Long? = -1L
     @Inject
     lateinit var threadDb: ThreadDatabase
 
@@ -240,7 +241,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
     }
 
     private fun callViewModel():Recipient?{
-         val viewModels: ConversationViewModel by viewModels {
+        val viewModels: ConversationViewModel by viewModels {
             var threadId = requireArguments().getLong(THREAD_ID,-1L)
             if (threadId == -1L) {
                 requireArguments().parcelable<Address>(ADDRESS)?.let { address ->
@@ -936,8 +937,8 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
         val recipient = viewModel.recipient.value ?: return
         if (recipient.isBlocked) {
             BlockedDialog(recipient).show(
-                    requireActivity().supportFragmentManager,
-                    "Blocked Dialog"
+                requireActivity().supportFragmentManager,
+                "Blocked Dialog"
             )
             return
         }
@@ -1107,8 +1108,8 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
         val recipient = viewModel.recipient.value ?: return
         if (recipient.isBlocked) {
             BlockedDialog(recipient).show(
-                    requireActivity().supportFragmentManager,
-                    "Blocked Dialog"
+                requireActivity().supportFragmentManager,
+                "Blocked Dialog"
             )
             return
         }
@@ -1118,8 +1119,8 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
                 this.activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
                 audioRecorder.startRecording()
                 stopAudioHandler.postDelayed(
-                        stopVoiceMessageRecordingTask,
-                        300000
+                    stopVoiceMessageRecordingTask,
+                    300000
                 ) // Limit voice messages to 5 minute each
             } else {
                 Permissions.with(this)
@@ -1260,34 +1261,34 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
 
     override fun inChatBDXOptions() {
         try {
-                val dialog = android.app.AlertDialog.Builder(requireActivity())
-                val inflater = layoutInflater
-                val dialogView = inflater.inflate(R.layout.pay_as_you_chat, null)
-                dialog.setView(dialogView)
-
-                val okButton = dialogView.findViewById<Button>(R.id.okButton)
-                val cancelButton = dialogView.findViewById<Button>(R.id.cancelButton)
-                val enableInstruction =
-                    dialogView.findViewById<TextView>(R.id.payAsYouChatEnable_Instruction)
-                val alert = dialog.create()
-                alert.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-                alert.setCanceledOnTouchOutside(false)
-                alert.show()
-                if (TextSecurePreferences.isPayAsYouChat(requireActivity())) {
-                    enableInstruction.text =
-                        fromHtml("To disable pay as you chat, go to <b>Settings -> Wallet Settings -> Pay As You Chat</b> to use this option")
-                } else {
-                    enableInstruction.text =
-                        fromHtml("Enable pay as you chat from <b>Settings -> Wallet Settings -> Pay As You Chat</b> to use this option")
-                }
-                okButton.setOnClickListener {
-                    val intent = Intent(requireActivity(), PrivacySettingsActivity::class.java)
-                    this.activity?.startActivity(intent)
-                    alert.dismiss()
-                }
-                cancelButton.setOnClickListener {
-                    alert.dismiss()
-                }
+            val dialog = android.app.AlertDialog.Builder(requireActivity())
+            val inflater = layoutInflater
+            val dialogView = inflater.inflate(R.layout.pay_as_you_chat, null)
+            dialog.setView(dialogView)
+
+            val okButton = dialogView.findViewById<Button>(R.id.okButton)
+            val cancelButton = dialogView.findViewById<Button>(R.id.cancelButton)
+            val enableInstruction =
+                dialogView.findViewById<TextView>(R.id.payAsYouChatEnable_Instruction)
+            val alert = dialog.create()
+            alert.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            alert.setCanceledOnTouchOutside(false)
+            alert.show()
+            if (TextSecurePreferences.isPayAsYouChat(requireActivity())) {
+                enableInstruction.text =
+                    fromHtml("To disable pay as you chat, go to <b>Settings -> Wallet Settings -> Pay As You Chat</b> to use this option")
+            } else {
+                enableInstruction.text =
+                    fromHtml("Enable pay as you chat from <b>Settings -> Wallet Settings -> Pay As You Chat</b> to use this option")
+            }
+            okButton.setOnClickListener {
+                val intent = Intent(requireActivity(), PrivacySettingsActivity::class.java)
+                this.activity?.startActivity(intent)
+                alert.dismiss()
+            }
+            cancelButton.setOnClickListener {
+                alert.dismiss()
+            }
         } catch (exception: Exception) {
             Timber.tag("Beldex").d("PayAsYouChat exception $exception")
         }
@@ -1442,33 +1443,33 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
     }
 
     override fun sendVoiceMessage() {
-            hideVoiceMessageUI()
-            this.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-            val future = audioRecorder.stopRecording()
-            stopAudioHandler.removeCallbacks(stopVoiceMessageRecordingTask)
-            future.addListener(object : ListenableFuture.Listener<Pair<Uri, Long>> {
+        hideVoiceMessageUI()
+        this.activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        val future = audioRecorder.stopRecording()
+        stopAudioHandler.removeCallbacks(stopVoiceMessageRecordingTask)
+        future.addListener(object : ListenableFuture.Listener<Pair<Uri, Long>> {
 
-                override fun onSuccess(result: Pair<Uri, Long>) {
-                    val audioSlide = AudioSlide(
-                        requireActivity(),
-                        result.first,
-                        result.second,
-                        MediaTypes.AUDIO_AAC,
-                        true
-                    )
-                    val slideDeck = SlideDeck()
-                    slideDeck.addSlide(audioSlide)
-                    sendAttachments(slideDeck.asAttachments(), null)
-                }
+            override fun onSuccess(result: Pair<Uri, Long>) {
+                val audioSlide = AudioSlide(
+                    requireActivity(),
+                    result.first,
+                    result.second,
+                    MediaTypes.AUDIO_AAC,
+                    true
+                )
+                val slideDeck = SlideDeck()
+                slideDeck.addSlide(audioSlide)
+                sendAttachments(slideDeck.asAttachments(), null)
+            }
 
-                override fun onFailure(e: ExecutionException) {
-                    Toast.makeText(
-                        requireActivity(),
-                        R.string.ConversationActivity_unable_to_record_audio,
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-            })
+            override fun onFailure(e: ExecutionException) {
+                Toast.makeText(
+                    requireActivity(),
+                    R.string.ConversationActivity_unable_to_record_audio,
+                    Toast.LENGTH_LONG
+                ).show()
+            }
+        })
     }
 
     override fun cancelVoiceMessage() {
@@ -2192,7 +2193,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
         } else {
             binding.inputBar.addTextChangedListener(object : SimpleTextWatcher() {
                 override fun onTextChanged(text: String?) {
-                   checkInputBarTextOnTextChanged(text,thread)
+                    checkInputBarTextOnTextChanged(text,thread)
                 }
             })
         }
@@ -2240,7 +2241,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
                     try {
                         if (userCount != null) {
                             binding.conversationSubtitleView.text =
-                                    getString(R.string.ConversationActivity_member_count, userCount)
+                                getString(R.string.ConversationActivity_member_count, userCount)
                         } else {
                             binding.conversationSubtitleView.isVisible = false
                         }
@@ -2333,7 +2334,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
                             })
 
                     } else {
-                        tm.listen(object : PhoneStateListener() {
+                        /*tm.listen(object : PhoneStateListener() {
                             override fun onCallStateChanged(state: Int, phoneNumber: String?) {
                                 super. onCallStateChanged(state, phoneNumber)
                                 when (state) {
@@ -2361,7 +2362,10 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
                                     }
                                 }
                             }
-                        }, PhoneStateListener.LISTEN_CALL_STATE)
+                        }, PhoneStateListener.LISTEN_CALL_STATE)*/
+                        viewModel.recipient.value?.let { recipient ->
+                            call(requireActivity(), recipient)
+                        }
                     }
                 } else {
                     viewModel.recipient.value?.let { recipient ->
@@ -2418,7 +2422,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
     private fun getLatestOpenGroupInfoIfNeeded() {
         try {
             val openGroup = viewModel.getOpenGroupChat()
-                    ?: return
+                ?: return
             OpenGroupAPIV2.getMemberCount(openGroup.room, openGroup.server)
                 .successUi { updateSubtitle() }
         } catch (ex: NullPointerException) {
@@ -3109,7 +3113,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
     override fun createTransactionFailed(errorText: String?) {
         hideProgress()
         if(getString(R.string.invalid_destination_address) == errorText!!){
-           //showAlert(getString(R.string.send_create_tx_error_title), getString(R.string.receiver_address_is_not_available))
+            //showAlert(getString(R.string.send_create_tx_error_title), getString(R.string.receiver_address_is_not_available))
             SendFailedDialog(getString(R.string.receiver_address_is_not_available)).show(requireActivity().supportFragmentManager,"")
             transactionInProgress = false
         }else{
@@ -3377,7 +3381,7 @@ class ConversationFragmentV2 : Fragment(), InputBarDelegate,
                         false
                     )
                     sync =
-                    getString(R.string.status_synchronized)
+                        getString(R.string.status_synchronized)
                     valueOfWallet = "${df.format(walletSyncPercentage)}%"
                     binding.inputBar.setDrawableProgressBar(requireActivity().applicationContext, false,valueOfWallet)
                     //SteveJosephh21
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 2cd0a283..f9f019e2 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/com/thoughtcrimes/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -169,90 +169,6 @@ object ConversationMenuHelper {
             R.id.menu_unmute_notifications -> { unmute(context, thread) }
             R.id.menu_mute_notifications -> { mute(context, thread) }
             R.id.menu_notification_settings -> { setNotifyType(context, thread) }
-          /*  R.id.menu_call -> {
-                *//*Hales63*//*
-                if (isOnline(context)) {
-                    Log.d("Beldex","Call state issue called")
-                    val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-                    if (ContextCompat.checkSelfPermission(
-                            context,
-                            Manifest.permission.READ_PHONE_STATE
-                        ) == PackageManager.PERMISSION_GRANTED
-                    ) {
-                        Log.d("Beldex","Call state issue called 1")
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                            Log.d("Beldex","Call state issue called 2")
-                            tm.registerTelephonyCallback(
-                                context.mainExecutor,
-                                object : TelephonyCallback(), TelephonyCallback.CallStateListener {
-                                    override fun onCallStateChanged(state: Int) {
-                                        when (state) {
-                                            TelephonyManager.CALL_STATE_RINGING -> {
-                                                Log.d("Beldex","Call state issue called 3")
-                                                Toast.makeText(
-                                                    context,
-                                                    "BChat call won't allow ,Because your phone call ringing",
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-                                            }
-                                            TelephonyManager.CALL_STATE_OFFHOOK -> {
-                                                Log.d("Beldex","Call state issue called 4")
-                                                Toast.makeText(
-                                                    context,
-                                                    "BChat call won't allow ,Because your phone call is on going",
-                                                    Toast.LENGTH_SHORT
-                                                ).show()
-
-                                            }
-                                            TelephonyManager.CALL_STATE_IDLE -> {
-                                                Log.d("Beldex","Call state issue called 5")
-                                                call(context, thread)
-                                            }
-                                        }
-                                    }
-                                })
-
-                        } else {
-                            Log.d("Beldex","Call state issue called 6")
-                            tm.listen(object : PhoneStateListener() {
-                                override fun onCallStateChanged(state: Int, phoneNumber: String?) {
-                                    super.onCallStateChanged(state, phoneNumber)
-                                    when (state) {
-                                        TelephonyManager.CALL_STATE_RINGING -> {
-                                            Log.d("Beldex","Call state issue called 7")
-                                            Toast.makeText(
-                                                context,
-                                                "BChat call won't allow ,Because your phone call ringing",
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-                                        }
-                                        TelephonyManager.CALL_STATE_OFFHOOK -> {
-                                            Log.d("Beldex","Call state issue called 8")
-                                            Toast.makeText(
-                                                context,
-                                                "BChat call won't allow ,Because your phone call is on going",
-                                                Toast.LENGTH_SHORT
-                                            ).show()
-
-                                        }
-                                        TelephonyManager.CALL_STATE_IDLE -> {
-                                            Log.d("Beldex","Call state issue called 9" )
-                                            call(context, thread)
-                                        }
-                                    }
-                                }
-                            }, PhoneStateListener.LISTEN_CALL_STATE)
-                        }
-                    }
-                    else{
-
-                        Log.d("Beldex","Call state issue called else")
-                    }
-
-                } else {
-                    Toast.makeText(context, "Check your Internet", Toast.LENGTH_SHORT).show()
-                }
-            }*/
         }
         return true
     }
@@ -292,16 +208,16 @@ object ConversationMenuHelper {
     private fun call(context: Context, thread: Recipient) {
 
         if (!TextSecurePreferences.isCallNotificationsEnabled(context)) {
-           /* AlertDialog.Builder(context)
-                .setTitle(R.string.ConversationActivity_call_title)
-                .setMessage(R.string.ConversationActivity_call_prompt)
-                .setPositiveButton(R.string.activity_settings_title) { _, _ ->
-                    val intent = Intent(context, PrivacySettingsActivity::class.java)
-                    context.startActivity(intent)
-                }
-                .setNeutralButton(R.string.cancel) { d, _ ->
-                    d.dismiss()
-                }.show()*/
+            /* AlertDialog.Builder(context)
+                 .setTitle(R.string.ConversationActivity_call_title)
+                 .setMessage(R.string.ConversationActivity_call_prompt)
+                 .setPositiveButton(R.string.activity_settings_title) { _, _ ->
+                     val intent = Intent(context, PrivacySettingsActivity::class.java)
+                     context.startActivity(intent)
+                 }
+                 .setNeutralButton(R.string.cancel) { d, _ ->
+                     d.dismiss()
+                 }.show()*/
             //SteveJosephh22
             val factory = LayoutInflater.from(context)
             val callPermissionDialogView: View = factory.inflate(R.layout.call_permissions_dialog_box, null)
@@ -313,7 +229,7 @@ object ConversationMenuHelper {
                 callPermissionDialog.dismiss()
             }
             callPermissionDialogView.findViewById<TextView>(R.id.cancelDialogBoxButton).setOnClickListener{
-                    callPermissionDialog.dismiss()
+                callPermissionDialog.dismiss()
             }
             callPermissionDialog.window!!.setBackgroundDrawableResource(android.R.color.transparent)
             callPermissionDialog.show()
@@ -411,31 +327,31 @@ object ConversationMenuHelper {
             context.resources.getString(R.string.ConversationActivity_are_you_sure_you_want_to_leave_this_group)
         }
         val builder = AlertDialog.Builder(context,R.style.BChatAlertDialog_Clear_All)
-        .setTitle(context.resources.getString(R.string.ConversationActivity_leave_group))
-        .setCancelable(true)
-        .setMessage(message)
-        .setPositiveButton(R.string.leave) { _, _ ->
-            var groupPublicKey: String?
-            var isClosedGroup: Boolean
-            try {
-                groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
-                isClosedGroup = DatabaseComponent.get(context).beldexAPIDatabase().isClosedGroup(groupPublicKey)
-            } catch (e: IOException) {
-                groupPublicKey = null
-                isClosedGroup = false
-            }
-            try {
-                if (isClosedGroup) {
-                    MessageSender.leave(groupPublicKey!!, true)
-                } else {
+            .setTitle(context.resources.getString(R.string.ConversationActivity_leave_group))
+            .setCancelable(true)
+            .setMessage(message)
+            .setPositiveButton(R.string.leave) { _, _ ->
+                var groupPublicKey: String?
+                var isClosedGroup: Boolean
+                try {
+                    groupPublicKey = doubleDecodeGroupID(thread.address.toString()).toHexString()
+                    isClosedGroup = DatabaseComponent.get(context).beldexAPIDatabase().isClosedGroup(groupPublicKey)
+                } catch (e: IOException) {
+                    groupPublicKey = null
+                    isClosedGroup = false
+                }
+                try {
+                    if (isClosedGroup) {
+                        MessageSender.leave(groupPublicKey!!, true)
+                    } else {
+                        Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
+                    }
+                } catch (e: Exception) {
                     Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
                 }
-            } catch (e: Exception) {
-                Toast.makeText(context, R.string.ConversationActivity_error_leaving_group, Toast.LENGTH_LONG).show()
             }
-        }
-        .setNegativeButton(R.string.no, null)
-        .show()
+            .setNegativeButton(R.string.no, null)
+            .show()
 
         //New Line
         val textView: TextView? = builder.findViewById(android.R.id.message)
@@ -475,4 +391,3 @@ object ConversationMenuHelper {
 
 }
 
-
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/service/WebRtcCallService.kt b/app/src/main/java/com/thoughtcrimes/securesms/service/WebRtcCallService.kt
index d8fe35c7..9c40d665 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/service/WebRtcCallService.kt
+++ b/app/src/main/java/com/thoughtcrimes/securesms/service/WebRtcCallService.kt
@@ -1,5 +1,6 @@
 package com.thoughtcrimes.securesms.service
 
+import android.app.ForegroundServiceStartNotAllowedException
 import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -10,10 +11,7 @@ import android.media.AudioManager
 import android.os.Build
 import android.os.IBinder
 import android.os.ResultReceiver
-import android.telephony.PhoneStateListener
 import android.telephony.TelephonyManager
-import androidx.annotation.RequiresApi
-import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.beldex.libbchat.messaging.calls.CallMessageType
@@ -29,7 +27,6 @@ import com.thoughtcrimes.securesms.util.CallNotificationBuilder.Companion.TYPE_I
 import com.thoughtcrimes.securesms.util.CallNotificationBuilder.Companion.TYPE_INCOMING_PRE_OFFER
 import com.thoughtcrimes.securesms.util.CallNotificationBuilder.Companion.TYPE_INCOMING_RINGING
 import com.thoughtcrimes.securesms.util.CallNotificationBuilder.Companion.TYPE_OUTGOING_RINGING
-import com.thoughtcrimes.securesms.util.CallNotificationBuilder.Companion.TYPE_SCREEN_ON
 import com.thoughtcrimes.securesms.webrtc.*
 import com.thoughtcrimes.securesms.webrtc.audio.OutgoingRinger
 import com.thoughtcrimes.securesms.webrtc.data.Event
@@ -188,8 +185,8 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
     private val lockManager by lazy { LockManager(this) }
     private val serviceExecutor = Executors.newSingleThreadExecutor()
     private val timeoutExecutor = Executors.newScheduledThreadPool(1)
-  /*  private val hangupOnCallAnswered = HangUpRtcOnPstnCallAnsweredListener {
-        *//*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+    /*  private val hangupOnCallAnswered = HangUpRtcOnPstnCallAnsweredListener {
+          *//*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             Log.d("Beldex","Build version is height of 26 ${Build.VERSION.SDK_INT}")
             this.startForegroundService(hangupIntent(this))
         }else {
@@ -198,11 +195,11 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
         }*//*
         this.startService(hangupIntent(this))
     }*/
-    private val hangupOnCallAnswered by lazy {
+    /*private val hangupOnCallAnswered by lazy {
         HangUpRtcOnPstnCallAnsweredListener {
             ContextCompat.startForegroundService(this, hangupIntent(this))
         }
-    }
+    }*/
     private val hangupTelephonyCallback by lazy {
         HangUpRtcTelephonyCallback {
             this.startService(hangupIntent(this))
@@ -301,13 +298,18 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
         registerWiredHeadsetStateReceiver()
         registerWantsToAnswerReceiver()
         if (checkSelfPermission(android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            /*if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
                 getSystemService(TelephonyManager::class.java)
                     .listen(hangupOnCallAnswered, PhoneStateListener.LISTEN_CALL_STATE)
             } else {
                 Log.d("hangupTelephonyCallback","register")
                 getSystemService(TelephonyManager::class.java)
                     .registerTelephonyCallback(serviceExecutor, hangupTelephonyCallback)
+            }*/
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                Log.d("hangupTelephonyCallback","register")
+                getSystemService(TelephonyManager::class.java)
+                    .registerTelephonyCallback(serviceExecutor, hangupTelephonyCallback)
             }
         }
         registerUncaughtExceptionHandler()
@@ -680,10 +682,15 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
     }
 
     private fun setCallInProgressNotification(type: Int, recipient: Recipient?) {
-        startForeground(
-            CallNotificationBuilder.WEBRTC_NOTIFICATION,
-            CallNotificationBuilder.getCallInProgressNotification(this, type, recipient)
-        )
+        try {
+            startForeground(
+                CallNotificationBuilder.WEBRTC_NOTIFICATION,
+                CallNotificationBuilder.getCallInProgressNotification(this, type, recipient)
+            )
+        }
+        catch(e: ForegroundServiceStartNotAllowedException) {
+            Log.e(TAG, "Failed to setCallInProgressNotification as a foreground service for type: ${type}, trying to update instead")
+        }
         if (!CallNotificationBuilder.areNotificationsEnabled(this) && type == TYPE_INCOMING_PRE_OFFER) {
             // start an intent for the fullscreen
             val foregroundIntent = Intent(this, WebRtcCallActivity::class.java)
@@ -744,11 +751,15 @@ class WebRtcCallService: Service(), CallManager.WebRtcListener {
         if (checkSelfPermission(android.Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
             val telephonyManager = getSystemService(TelephonyManager::class.java)
             with(telephonyManager) {
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+                /*if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
                     this.listen(hangupOnCallAnswered, PhoneStateListener.LISTEN_NONE)
                 } else {
                     Log.d("hangupTelephonyCallback","unregister")
                     this.unregisterTelephonyCallback(hangupTelephonyCallback)
+                }*/
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    Log.d("hangupTelephonyCallback","unregister")
+                    this.unregisterTelephonyCallback(hangupTelephonyCallback)
                 }
             }
         }
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/util/RestoreHeight.java b/app/src/main/java/com/thoughtcrimes/securesms/util/RestoreHeight.java
index 5084330b..102f34c9 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/util/RestoreHeight.java
+++ b/app/src/main/java/com/thoughtcrimes/securesms/util/RestoreHeight.java
@@ -92,6 +92,8 @@ static public RestoreHeight getInstance() {
         blockheight.put("2024-01-01", 2894560L);
         blockheight.put("2024-02-01", 2986700L);
         blockheight.put("2024-03-01", 3049909L);
+        blockheight.put("2024-04-01", 3130759L);
+        blockheight.put("2024-05-01", 3187660L);
     }
 
     public long getHeight(String date) {
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/webrtc/CallManager.kt b/app/src/main/java/com/thoughtcrimes/securesms/webrtc/CallManager.kt
index b69e2ce5..44157912 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/webrtc/CallManager.kt
+++ b/app/src/main/java/com/thoughtcrimes/securesms/webrtc/CallManager.kt
@@ -311,12 +311,12 @@ class CallManager(context: Context, audioManager: AudioManagerCompat, private va
 
                 MessageSender.sendNonDurably(
                     CallMessage(
-                    ICE_CANDIDATES,
-                    sdps = sdps,
-                    sdpMLineIndexes = sdpMLineIndexes,
-                    sdpMids = sdpMids,
-                    currentCallId
-                ), currentRecipient.address)
+                        ICE_CANDIDATES,
+                        sdps = sdps,
+                        sdpMLineIndexes = sdpMLineIndexes,
+                        sdpMids = sdpMids,
+                        currentCallId
+                    ), currentRecipient.address)
             }
         }
     }
@@ -733,7 +733,7 @@ class CallManager(context: Context, audioManager: AudioManagerCompat, private va
                 val intent = WebRtcCallService.cameraEnabled(context, true)
                 context.startService(intent)
             }
-         }
+        }
     }
 
     fun handleResponseMessage(recipient: Recipient, callId: UUID, answer: SessionDescription) {
@@ -812,42 +812,6 @@ class CallManager(context: Context, audioManager: AudioManagerCompat, private va
             MessageSender.sendNonDurably(CallMessage.offer(offer.description, callId), recipient.address)
         }
     }
-private fun isCallIdle(context: Context): Int {
-    var isCall = -1
-    val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-    if (ContextCompat.checkSelfPermission(
-            context,
-            android.Manifest.permission.READ_PHONE_STATE
-        ) == PackageManager.PERMISSION_GRANTED
-    ) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            tm.registerTelephonyCallback(
-                context.mainExecutor,
-                object : TelephonyCallback(), TelephonyCallback.CallStateListener {
-                    override fun onCallStateChanged(state: Int) {
-                        when (state) {
-                            TelephonyManager.CALL_STATE_IDLE -> {
-                                isCall = 0
-                            }
-                        }
-                    }
-                })
-
-        } else {
-            tm.listen(object : PhoneStateListener() {
-                override fun onCallStateChanged(state: Int, phoneNumber: String?) {
-                    super.onCallStateChanged(state, phoneNumber)
-                    if (state == TelephonyManager.CALL_STATE_IDLE) {
-                        isCall = 0
-                    }
-                }
-            }, PhoneStateListener.LISTEN_CALL_STATE)
-        }
-    } else {
-        isCall = 0
-    }
-    return isCall
-}
 
     fun isInitiator(): Boolean = peerConnection?.isInitiator() == true
 
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/webrtc/WebRtcCallServiceReceivers.kt b/app/src/main/java/com/thoughtcrimes/securesms/webrtc/WebRtcCallServiceReceivers.kt
index 83e0b029..6b380c6b 100644
--- a/app/src/main/java/com/thoughtcrimes/securesms/webrtc/WebRtcCallServiceReceivers.kt
+++ b/app/src/main/java/com/thoughtcrimes/securesms/webrtc/WebRtcCallServiceReceivers.kt
@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.telephony.PhoneStateListener
 import android.telephony.TelephonyCallback
 import android.telephony.TelephonyManager
 import androidx.annotation.RequiresApi
@@ -15,7 +14,7 @@ import com.thoughtcrimes.securesms.ApplicationContext
 import com.thoughtcrimes.securesms.service.WebRtcCallService
 import com.thoughtcrimes.securesms.webrtc.locks.LockManager
 
-class HangUpRtcOnPstnCallAnsweredListener(private val hangupListener: ()->Unit): PhoneStateListener() {
+/*class HangUpRtcOnPstnCallAnsweredListener(private val hangupListener: ()->Unit): PhoneStateListener() {
 
     companion object {
         private val TAG = Log.tag(HangUpRtcOnPstnCallAnsweredListener::class.java)
@@ -28,7 +27,7 @@ class HangUpRtcOnPstnCallAnsweredListener(private val hangupListener: ()->Unit):
             Log.i(TAG, "Device phone call ended BChat call.")
         }
     }
-}
+}*/
 
 @RequiresApi(Build.VERSION_CODES.S)
 class HangUpRtcTelephonyCallback(private val hangupListener: ()->Unit): TelephonyCallback(), TelephonyCallback.CallStateListener {
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4e529918..d06c6169 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -566,7 +566,7 @@
                 android:fontFamily="@font/open_sans_medium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="BChat V2.3.0"
+                android:text="BChat V2.5.1"
                 android:textAlignment="viewEnd"
                 android:textColor="@color/bchat_version"
                 android:textStyle="normal" />