idk/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to not search extra hop, only considered if connecting only to trusted peers, issue #6

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-10-02 05:45:46 +01:00
parent e9798c7eaa
commit eda3e7ad3a
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
View File

@@ -86,7 +86,8 @@ class MainFrameController {
terms.each { if (it.length() > 0) nonEmpty << it }
searchEvent = new SearchEvent(searchTerms : nonEmpty, uuid : uuid, oobInfohash: true)
}
core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true,
boolean firstHop = core.muOptions.allowUntrusted || core.muOptions.searchExtraHop
core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : firstHop,
replyTo: core.me.destination, receivedOn: core.me.destination,
originator : core.me))
}

4
gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
View File

@@ -96,6 +96,10 @@ class OptionsController {
model.onlyTrusted = onlyTrusted
settings.setAllowUntrusted(!onlyTrusted)
boolean searchExtraHop = view.searchExtraHopCheckbox.model.isSelected()
model.searchExtraHop = searchExtraHop
settings.searchExtraHop = searchExtraHop
boolean trustLists = view.allowTrustListsCheckbox.model.isSelected()
model.trustLists = trustLists
settings.allowTrustLists = trustLists

2
gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
View File

@@ -38,6 +38,7 @@ class OptionsModel {
// trust options
@Observable boolean onlyTrusted
@Observable boolean searchExtraHop
@Observable boolean trustLists
@Observable String trustListInterval
@@ -73,6 +74,7 @@ class OptionsModel {
}
onlyTrusted = !settings.allowUntrusted()
searchExtraHop = settings.searchExtraHop
trustLists = settings.allowTrustLists
trustListInterval = String.valueOf(settings.trustListInterval)
}

13
gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
View File

@@ -55,6 +55,7 @@ class OptionsView {
def outBwField
def allowUntrustedCheckbox
def searchExtraHopCheckbox
def allowTrustListsCheckbox
def trustListIntervalField
@@ -138,11 +139,13 @@ class OptionsView {
gridBagLayout()
label(text : "Allow only trusted connections", constraints : gbc(gridx: 0, gridy : 0))
allowUntrustedCheckbox = checkBox(selected : bind {model.onlyTrusted}, constraints : gbc(gridx: 1, gridy : 0))
label(text : "Allow others to view my trust list", constraints : gbc(gridx: 0, gridy : 1))
allowTrustListsCheckbox = checkBox(selected : bind {model.trustLists}, constraints : gbc(gridx: 1, gridy : 1))
label(text : "Update trust lists every ", constraints : gbc(gridx:0, gridy:2))
trustListIntervalField = textField(text : bind {model.trustListInterval}, constraints:gbc(gridx:1, gridy:2))
label(text : "hours", constraints : gbc(gridx: 2, gridy:2))
label(text : "Search extra hop", constraints : gbc(gridx:0, gridy:1))
searchExtraHopCheckbox = checkBox(selected : bind {model.searchExtraHop}, constraints : gbc(gridx: 1, gridy : 1))
label(text : "Allow others to view my trust list", constraints : gbc(gridx: 0, gridy : 2))
allowTrustListsCheckbox = checkBox(selected : bind {model.trustLists}, constraints : gbc(gridx: 1, gridy : 2))
label(text : "Update trust lists every ", constraints : gbc(gridx:0, gridy:3))
trustListIntervalField = textField(text : bind {model.trustListInterval}, constraints:gbc(gridx:1, gridy:3))
label(text : "hours", constraints : gbc(gridx: 2, gridy:3))
}