Zabranjeno slanje poruke samom sebi #80

2 files changed, 31 insertions, 30 deletions

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
index 0d90ad1..af6c93b 100644
--- a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
+++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
@@ -12,10 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-<<<<<<< HEAD
-    <timeTargetWasSelectedWithDropDown value="2022-12-05T15:17:54.592850800Z" />
-=======
-    <timeTargetWasSelectedWithDropDown value="2022-12-06T03:10:09.596363200Z" />
->>>>>>> 8e563f959c168a9778658c5fa2a2b143730d44fa
+    <timeTargetWasSelectedWithDropDown value="2022-12-07T14:05:59.558531400Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
index 985735f..04dd9de 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivityConversation.kt
@@ -73,34 +73,39 @@ class ChatActivityConversation : AppCompatActivity() {
                             if(response.isSuccessful()){
                                 //zahtev da se posalje poruka
                                 var user:UserReceive=response.body()!!
-                                userId=user._id
-                                setHeader()
-                                var message= MessageSend(userId!!,messageContent)
-                                val request2=Api.sendMessage("Bearer "+token,
-                                    message
-                                )
-                                request2.enqueue(object : retrofit2.Callback<Message?> {
-                                    override fun onResponse(call: Call<Message?>, response: Response<Message?>) {
-                                        if(response.isSuccessful()){
-                                            //zahtev da se posalje poruka
-                                            var responseMessage=response.body()
-                                            var cal: Calendar = Calendar.getInstance()
-                                            cal.time=responseMessage?.timestamp
-                                            responseMessage?.usableTimeStamp=cal
-                                            dbConnection?.addMessage(responseMessage!!,username=user.username)
-                                            requestMessages()
-                                            binding.etNewMessage.text?.clear()
+                                if(user._id==JWT(SharedPreferencesHelper.getValue("jwt",this@ChatActivityConversation)!!).claims["id"]?.asString()!!){
+                                    Toast.makeText(this@ChatActivityConversation,"Ne mozete slati poruku sami sebi.",Toast.LENGTH_LONG).show()
+                                }
+                                else{
+                                    userId=user._id
+                                    setHeader()
+                                    var message= MessageSend(userId!!,messageContent)
+                                    val request2=Api.sendMessage("Bearer "+token,
+                                        message
+                                    )
+                                    request2.enqueue(object : retrofit2.Callback<Message?> {
+                                        override fun onResponse(call: Call<Message?>, response: Response<Message?>) {
+                                            if(response.isSuccessful()){
+                                                //zahtev da se posalje poruka
+                                                var responseMessage=response.body()
+                                                var cal: Calendar = Calendar.getInstance()
+                                                cal.time=responseMessage?.timestamp
+                                                responseMessage?.usableTimeStamp=cal
+                                                dbConnection?.addMessage(responseMessage!!,username=user.username)
+                                                requestMessages()
+                                                binding.etNewMessage.text?.clear()
 
+                                            }
+                                            else{
+                                                Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime1.",Toast.LENGTH_LONG).show()
+                                            }
                                         }
-                                        else{
-                                            Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime1.",Toast.LENGTH_LONG).show()
-                                        }
-                                    }
 
-                                    override fun onFailure(call: Call<Message?>, t: Throwable) {
-                                        Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime2.",Toast.LENGTH_LONG).show()
-                                    }
-                                })
+                                        override fun onFailure(call: Call<Message?>, t: Throwable) {
+                                            Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime2.",Toast.LENGTH_LONG).show()
+                                        }
+                                    })
+                                }
                             }
                             else{
                                 Log.d("main",response.message())