Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android: disable local node usage #4043

Merged
merged 5 commits into from
Dec 2, 2022
Merged

Android: disable local node usage #4043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6441d99
Android: useRemoteNode default to true
Malinero Oct 2, 2022
8cf76cf
Android: hide mining tab
Malinero Oct 2, 2022
499eeee
Android: hide log tab
Malinero Oct 2, 2022
22a1509
Android: hide local node settings
Malinero Oct 2, 2022
7954661
Android: disable simple mode
Malinero Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ ApplicationWindow {
property bool historyShowAdvanced: false
property bool historyHumanDates: true
property string blockchainDataDir: ""
property bool useRemoteNode: false
property bool useRemoteNode: isAndroid
property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release
property string remoteNodesSerialized: JSON.stringify({
selected: 0,
Expand Down
5 changes: 3 additions & 2 deletions pages/Advanced.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ ColumnLayout {
active: state == "Mining"
text: qsTr("Mining") + translationManager.emptyString
onSelected: state = "Mining"
visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: state == "Prove"
Expand Down Expand Up @@ -81,7 +82,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredHeight: panelHeight
color: "transparent"
state: "Mining"
state: isAndroid ? "Prove" : "Mining"

onCurrentViewChanged: {
if (previousView) {
Expand Down Expand Up @@ -120,7 +121,7 @@ ColumnLayout {

StackView {
id: stackView
initialItem: stateView.miningView
initialItem: isAndroid ? stateView.prooveView : stateView.miningView
anchors.fill: parent
clip: false // otherwise animation will affect left panel

Expand Down
1 change: 1 addition & 0 deletions pages/settings/Settings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ ColumnLayout {
active: settingsStateView.state == "Log"
text: qsTr("Log") + translationManager.emptyString
onSelected: settingsStateView.state = "Log"
visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: settingsStateView.state == "Info"
Expand Down
1 change: 1 addition & 0 deletions pages/settings/SettingsNode.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Rectangle{
Layout.fillWidth: true
Layout.preferredHeight: 90
color: "transparent"
visible: !isAndroid

Rectangle {
id: localNodeDivider
Expand Down
2 changes: 1 addition & 1 deletion wizard/WizardModeSelection.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Rectangle {
property alias pageHeight: pageRoot.height
property string viewName: "wizardModeSelection1"
property bool portable: persistentSettings.portable
property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0
property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0 && !isAndroid

function applyWalletMode(mode, wizardState) {
if (!persistentSettings.setPortable(portable)) {
Expand Down