blob: dfdd622cee8b05436d8b7a95494bdafdb4c380e9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
import QtQuick 2.15
import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0
import "../themes/themes.js" as Theme
Page {
id: splash
property int timeoutInterval: qmlDebug ? 600 : 1600
property alias errors: splashErrorBox
ToolButton {
id: closeButton
visible: false
anchors {
right: parent.right
//rightMargin: -10
}
icon.source: "../resources/close.svg"
HoverHandler {
cursorShape: Qt.PointingHandCursor
}
onClicked: {
loader.source = "MainView.qml"
}
}
Column {
width: parent.width * 0.8
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 24
MotdBox {
id: motd
visible: false
anchors {
top: parent.top
topMargin: 100
bottomMargin: 30
}
}
VerticalSpacer {
id: motdSpacer
visible: false
height: 100
}
VerticalSpacer {
id: upperSpacer
visible: true
height: root.height * 0.25
}
Image {
id: connectionImage
height: 180
anchors.horizontalCenter: parent.horizontalCenter
source: "../resources/icon-noshield.svg"
fillMode: Image.PreserveAspectFit
}
VerticalSpacer {
id: middleSpacer
visible: true
height: root.height * 0.05
}
ProgressBar {
id: splashProgress
width: appWidth * 0.8 - 60
indeterminate: true
anchors.horizontalCenter: parent.horizontalCenter
}
InitErrors {
id: splashErrorBox
}
} // end Column
Image {
id: motdImage
visible: false
height: 100
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
anchors.bottomMargin: 50
source: "../resources/icon-noshield.svg"
fillMode: Image.PreserveAspectFit
}
Timer {
id: splashTimer
}
function hasMotd() {
return needsUpgrade() || (ctx && !isEmpty(ctx.motd))
}
function getUpgradeText() {
return qsTr("There is a newer version available. ") + qsTr("Make sure to <a href=\"https://0xacab.org/leap/bitmask-vpn/-/blob/main/docs/uninstall.md\">uninstall</a> the previous one before running the new installer.")
}
function getUpgradeLink() {
return "<a href='" + getLinkURL() + "'>" + qsTr("UPGRADE NOW") + "</a>";
}
function getLinkURL() {
return "https://downloads.leap.se/RiseupVPN/" + Qt.platform.os + "/"
}
function needsUpgrade() {
if (ctx && isTrue(ctx.canUpgrade)) {
if (qmlDebug) {
return true
}
let platform = Qt.platform.os
//DEBUG -------------------------------------------------------------------
//if (platform == "windows" || platform == "osx" || platform == "linux" ) {
//DEBUG -------------------------------------------------------------------
if (platform == "windows" || platform == "osx") {
return true
}
}
return false
}
function showMotd() {
// XXX this is not picking locales configured by LANG or LC_ALL
let isUpgrade = false
let lang = Qt.locale().name.substring(0,2)
let messages = JSON.parse(ctx.motd)
let platform = Qt.platform.os
let textEn = ""
let textLocale = ""
let link = ""
if (needsUpgrade()) {
isUpgrade = true;
textLocale = getUpgradeText();
link = getUpgradeLink();
} else {
// TODO fallback in case upgrade has no text
console.debug("configured locale: " + lang)
console.debug("platform: " + Qt.platform.os)
for (let i=0; i < messages.length; i++) {
let m = messages[i]
if (m.platform == "all" || m.platform == platform) {
for (let k=0; k < m.text.length; k++) {
if (m.text[k].lang == lang) {
textLocale = m.text[k].str
break
} else if (m.text[k].lang == "en") {
testEn = m.text[k].str
}
}
break
}
}
}
if (isUpgrade) {
upperSpacer.height = 100
} else {
// TODO get proportional to textLocale/textEn
upperSpacer.height = 50
}
//connectionImage.height = 100
connectionImage.visible = false
motdImage.visible = true
middleSpacer.visible = false
splashProgress.visible = false
motd.visible = true
motdSpacer.visible = true
motd.motdText = textLocale ? textLocale : textEn
motd.motdLink = link
motd.url = getLinkURL()
// FIXME if no text, just skip to main view
closeButton.visible = true
}
function delay(delayTime, cb) {
splashTimer.interval = delayTime
splashTimer.repeat = true
splashTimer.triggered.connect(cb)
splashTimer.start()
}
function loadMainViewWhenReady() {
if (!isEmpty(root.error)) {
return
}
if (ctx && isTrue(ctx.isReady) || qmlDebug) {
splashTimer.stop()
if (hasMotd()) {
console.debug("show motd");
showMotd();
} else {
loader.source = "MainView.qml"
}
} else {
if (!splashTimer.running) {
console.debug('delay...')
delay(500, loadMainViewWhenReady)
}
}
}
Timer {
interval: timeoutInterval
running: true
repeat: false
onTriggered: {
loadMainViewWhenReady()
}
}
Component.onCompleted: {
}
function isTrue(val) {
return val == "true";
}
function isEmpty(val) {
return val == "";
}
}
|
