rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove URL in menu

Browse Source
This commit is contained in:
J-Jamet
2023-07-28 17:26:00 +02:00
parent 68430ef62c
commit 4db03fe034
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
View File

@@ -67,7 +67,6 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
import com.kunzisoft.keepass.tasks.ActionRunnable
import com.kunzisoft.keepass.tasks.AttachmentFileBinderManager
import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.UriUtil.openUrl
import com.kunzisoft.keepass.utils.UuidUtil
import com.kunzisoft.keepass.utils.getParcelableExtraCompat
import com.kunzisoft.keepass.view.changeControlColor
@@ -99,7 +98,6 @@ class EntryActivity : DatabaseLockActivity() {
private var mMainEntryId: NodeId<UUID>? = null
private var mHistoryPosition: Int = -1
private var mEntryIsHistory: Boolean = false
private var mUrl: String? = null
private var mEntryLoaded = false
private var mAttachmentFileBinderManager: AttachmentFileBinderManager? = null
@@ -247,7 +245,6 @@ class EntryActivity : DatabaseLockActivity() {
if (entryInfo.title.isNotEmpty()) entryInfo.title else UuidUtil.toHexString(entryInfo.id)
collapsingToolbarLayout?.title = entryTitle
toolbar?.title = entryTitle
mUrl = entryInfo.url
// Assign tags
val tags = entryInfo.tags
tagsListView?.visibility = if (tags.isEmpty()) View.GONE else View.VISIBLE
@@ -409,9 +406,6 @@ class EntryActivity : DatabaseLockActivity() {
}
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
if (mUrl?.isEmpty() != false) {
menu?.findItem(R.id.menu_goto_url)?.isVisible = false
}
if (mEntryIsHistory || mDatabaseReadOnly) {
menu?.findItem(R.id.menu_save_database)?.isVisible = false
menu?.findItem(R.id.menu_merge_database)?.isVisible = false
@@ -472,12 +466,6 @@ class EntryActivity : DatabaseLockActivity() {
}
return true
}
R.id.menu_goto_url -> {
mUrl?.let { url ->
this.openUrl(url)
}
return true
}
R.id.menu_restore_entry_history -> {
mMainEntryId?.let { mainEntryId ->
restoreEntryHistory(

6
app/src/main/res/menu/entry.xml
View File

@@ -25,10 +25,4 @@
android:orderInCategory="22"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
<item android:id="@+id/menu_goto_url"
android:icon="@drawable/ic_launch_white_24dp"
android:title="@string/menu_url"
android:orderInCategory="23"
app:iconTint="?attr/colorControlNormal"
app:showAsAction="ifRoom" />
</menu>