diff options
3 files changed, 23 insertions, 1 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt index b9d3923..f6edcdf 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt @@ -11,7 +11,9 @@ import androidx.core.view.isVisible import androidx.fragment.app.FragmentTransaction import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener +import com.auth0.android.jwt.JWT import com.bumptech.glide.Glide +import com.exam.DBHelper import com.example.brzodolokacije.Fragments.FragmentUserPostsProfileActivity import com.example.brzodolokacije.Models.UserReceive import com.example.brzodolokacije.R @@ -38,6 +40,7 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener { private lateinit var userObject:UserReceive private lateinit var openChat:ImageButton private lateinit var unfollowUser:Button + private lateinit var btnSendMessage:ImageButton private lateinit var showFollowers:Button private lateinit var showFollowing:Button @@ -60,6 +63,7 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener { openChat=findViewById(id.activityUserProfileOpenChat) showFollowing=findViewById(id.tvActivityUserProfileFollow) showFollowers=findViewById(R.id.tvActivityUserProfileFollowers) + btnSendMessage=findViewById(R.id.activityUserProfileOpenChat) val jsonMyObject: String @@ -171,6 +175,21 @@ class ActivityUserProfile : AppCompatActivity(),OnRefreshListener { startActivity(intent) } + btnSendMessage.setOnClickListener{ + if(userObject._id != SharedPreferencesHelper.getValue("jwt",this@ActivityUserProfile) + ?.let { it1 -> JWT(it1).claims["id"]?.asString() }){ + val intent: Intent = Intent(this@ActivityUserProfile, ChatActivityConversation::class.java) + intent.putExtra("userId",userObject._id) + intent.putExtra("username",userObject.username) + intent.putExtra("pfp",userObject.pfp?._id) + DBHelper.getInstance(this).readContact(userObject._id) + this.startActivity(intent) + } + else{ + Toast.makeText(this,"Ne močete slati poruku samom sebi.",Toast.LENGTH_LONG).show() + } + } + showUserPosts.setOnClickListener { 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 b81867e..83dd403 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 @@ -59,7 +59,8 @@ class ChatActivityConversation : AppCompatActivity() { setRecyclerView() requestMessages() webSocketConnection=SignalRListener.getInstance(this@ChatActivityConversation) - (webSocketConnection!!.activity as ChatActivity).setClickedActivity(this@ChatActivityConversation) + if(webSocketConnection!!.activity is ChatActivity) + (webSocketConnection!!.activity as ChatActivity).setClickedActivity(this@ChatActivityConversation) setListeners() } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt index 5808aab..ee7e924 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/chat/DBHelper.kt @@ -244,10 +244,12 @@ class DBHelper : } fun readContact(userId: String){ + onCreate(db) var sql="UPDATE "+ CONTACTS_TABLE_NAME+" SET read=1 WHERE userId='"+userId+"'" db?.execSQL(sql) } fun unreadContact(userId: String){ + onCreate(db) var sql="UPDATE "+ CONTACTS_TABLE_NAME+" SET read=0 WHERE userId='"+userId+"'" db?.execSQL(sql) } |