Uklonjena mogucnost slanja poruka samo preko korisnickog imena i dodata provera da li postoji korisnik kome se salje poruka #83

5 files changed, 4 insertions, 114 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
index 49c61c7..5ddea3d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ChatActivity.kt
@@ -132,11 +132,6 @@ class ChatActivity : AppCompatActivity(), SwipeRefreshLayout.OnRefreshListener {
 
 
     fun setListeners(){
-        findViewById<ImageButton>(R.id.addNewMessage).setOnClickListener {
-            val intent: Intent = Intent(this@ChatActivity,ChatActivityConversation::class.java)
-            intent.putExtra("receiverId","")
-            startActivity(intent)
-        }
         findViewById<ImageButton>(R.id.btnBack).setOnClickListener {
             finish()
         }
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 3a52cc4..723980b 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
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.util.Log
-import android.view.View
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.Toast
@@ -72,63 +71,6 @@ class ChatActivityConversation : AppCompatActivity() {
             var messageContent=findViewById<EditText>(R.id.etNewMessage).text.trim().toString()
             val Api= RetrofitHelper.getInstance()
             if(!messageContent.isNullOrEmpty()){
-                if(userId.isNullOrEmpty() || userId.equals("null")){
-                    //zahtev sa username=om
-                    receiverUsername=findViewById<EditText>(R.id.etReceiverUsername).text.toString()
-                    val request=Api.getProfile("Bearer "+token,
-                        receiverUsername!!
-                    )
-                    request.enqueue(object : retrofit2.Callback<UserReceive?> {
-                        override fun onResponse(call: Call<UserReceive?>, response: Response<UserReceive?>) {
-                            if(response.isSuccessful()){
-                                //zahtev da se posalje poruka
-                                var user:UserReceive=response.body()!!
-                                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()
-                                            }
-                                        }
-
-                                        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())
-                                //Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime3.",Toast.LENGTH_LONG).show()
-                            }
-                        }
-
-                        override fun onFailure(call: Call<UserReceive?>, t: Throwable) {
-                            Toast.makeText(this@ChatActivityConversation,"fail.",Toast.LENGTH_LONG).show()
-                        }
-                    })
-                }
-                else{
                     //zahtev da se posalje poruka
                     var message= MessageSend(userId!!,messageContent)
                     val request2=Api.sendMessage("Bearer "+token,
@@ -155,8 +97,6 @@ class ChatActivityConversation : AppCompatActivity() {
                             Toast.makeText(this@ChatActivityConversation,"Pogresno korisnicko ime.",Toast.LENGTH_LONG).show()
                         }
                     })
-                }
-
             }
         }
         binding.llHeader.setOnClickListener {
@@ -172,20 +112,12 @@ class ChatActivityConversation : AppCompatActivity() {
 
     private fun setHeader(){
         if(userId.isNullOrEmpty() || userId.equals("null")){
-            binding.cvParentUsername.visibility= View.VISIBLE
-            binding.cvParentUsername.forceLayout()
-            binding.llHeader.visibility= View.GONE
-            binding.llHeader.invalidate()
-            binding.llHeader.forceLayout()
+            binding.tvFragmentTitle.text="Nije nađen korisnik"
+            binding.tvFragmentTitle.invalidate()
         }
         else{
-            binding.llHeader.visibility= View.VISIBLE
-            binding.llHeader.invalidate()
-            binding.llHeader.forceLayout()
             binding.tvFragmentTitle.text=receiverUsername
             binding.tvFragmentTitle.invalidate()
-            binding.cvParentUsername.visibility= View.GONE
-            binding.cvParentUsername.forceLayout()
         }
         binding.btnBack.setOnClickListener {
             finish()
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
index 88685e4..43c2109 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
@@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 object RetrofitHelper {
-    //val baseUrl="http://10.0.2.2:5279"
-    val baseUrl="http://147.91.204.115:10082"
+    val baseUrl="http://10.0.2.2:5279"
+    //val baseUrl="http://147.91.204.115:10082"
     private var retrofit_noauth: IBackendApi? = null
     private var retrofit_auth: IBackendApi? = null
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
index 9815ce1..3b92058 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat.xml
@@ -6,18 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".Activities.ChatActivity">
 
-    <ImageButton
-        android:id="@+id/addNewMessage"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:clickable="true"
-        android:elevation="50dp"
-        android:focusable="true"
-        android:backgroundTint="@color/unfollow"
-        android:src="@drawable/ic_baseline_add_message_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
 <androidx.appcompat.widget.LinearLayoutCompat
     android:layout_width="match_parent"
     android:id="@+id/llHeader"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
index d68d4b6..f6b767c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_chat_conversation.xml
@@ -45,34 +45,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="center_vertical"
-                    android:text="Chat"
                     android:textSize="20dp" />
             </androidx.appcompat.widget.LinearLayoutCompat>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/cvParentUsername"
-                android:layout_width="wrap_content"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:elevation="0dp"
-                app:cardCornerRadius="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/etReceiverUsername"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="@drawable/rounded_white_button_login"
-                    android:hint="  kome slati poruku?"
-                    android:inputType="textPersonName"
-                    android:paddingLeft="15dp" />
-
-
-            </androidx.cardview.widget.CardView>
         </androidx.appcompat.widget.LinearLayoutCompat>