From 35412e627ea79ab4eb92f37413f0aeb75741c971 Mon Sep 17 00:00:00 2001 From: ByeongsuPark Date: Thu, 12 Jan 2023 17:47:06 +0900 Subject: [PATCH] Fix user self-block in FullProfileActivity --- .../habitica/ui/activities/FullProfileActivity.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt index 1fd8b47ce..2dfaa00f5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.ui.activities import android.content.Context +import android.content.SharedPreferences import android.graphics.Typeface import android.os.Bundle import android.text.method.LinkMovementMethod @@ -58,6 +59,8 @@ class FullProfileActivity : BaseActivity() { lateinit var apiClient: ApiClient @Inject lateinit var socialRepository: SocialRepository + @Inject + lateinit var sharedPrefs: SharedPreferences private var userID = "" private var username: String? = null @@ -120,6 +123,9 @@ class FullProfileActivity : BaseActivity() { val inflater = menuInflater inflater.inflate(R.menu.menu_full_profile, menu) val item = menu.findItem(R.id.block_user) + + if (isMyProfile()) item.isVisible = false + if (isUserBlocked()) { item?.title = getString(R.string.unblock_user) } else { @@ -128,6 +134,10 @@ class FullProfileActivity : BaseActivity() { return super.onCreateOptionsMenu(menu) } + private fun isMyProfile(): Boolean { + return sharedPrefs.getString("UserID", "") == userID + } + private fun isUserBlocked(): Boolean { return blocks.contains(userID) }