Skip to content

Commit 9967ac8

Browse files
committed
change progress bar labels + minor bug fix
1 parent 850025e commit 9967ac8

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

android/tinySSB/app/src/main/assets/web/tremola.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,7 @@ function b2f_new_event(e) { // incoming SSB log event: we get map with three ent
11771177
contact.alias = e.public[1] == "" ? id2b32(e.header.fid) : e.public[1]
11781178
contact.initial = contact.alias.substring(0, 1).toUpperCase()
11791179
load_contact_list()
1180+
load_board_list()
11801181

11811182
// update names in connected devices menu
11821183
for (var l in localPeers) {

android/tinySSB/app/src/main/assets/web/tremola_ui.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,26 +534,26 @@ function refresh_connection_progressbar(min_entries, old_min_entries, old_want_e
534534

535535
if(curr_want_entries >= max_entries || old_want_entries == max_entries) {
536536
document.getElementById('connection-overlay-progressbar-want').value = 100
537-
document.getElementById('connection-overlay-progressbar-label-want').textContent = "Requesting — Synchronized"
537+
document.getElementById('connection-overlay-progressbar-label-want').textContent = "Missing — Synchronized"
538538
} else {
539539
var newPosReq = (curr_want_entries - old_want_entries) / (max_entries - old_want_entries) * 100
540540

541541
console.log("newPosMax:", newPosReq)
542542

543543
document.getElementById('connection-overlay-progressbar-want').value = newPosReq
544-
document.getElementById('connection-overlay-progressbar-label-want').textContent = Math.trunc(newPosReq) + "% - " + (max_entries - curr_want_entries) + " entries left"
544+
document.getElementById('connection-overlay-progressbar-label-want').textContent = "Missing - " + (max_entries - curr_want_entries) + " entries left"
545545

546546
}
547547

548548
// update gift progress
549549
if (curr_want_entries <= min_entries || old_min_entries == curr_want_entries) {
550550
document.getElementById('connection-overlay-progressbar-gift').value = 100
551-
document.getElementById('connection-overlay-progressbar-label-gift').textContent = "Offering — Synchronized"
551+
document.getElementById('connection-overlay-progressbar-label-gift').textContent = "Ahead — Synchronized"
552552
} else {
553553
var newPosOff = (min_entries - old_min_entries) / (curr_want_entries - old_min_entries) * 100
554554

555555
document.getElementById('connection-overlay-progressbar-gift').value = newPosOff
556-
document.getElementById('connection-overlay-progressbar-label-gift').textContent = Math.trunc(newPosOff) + "% - " + (curr_want_entries - min_entries) + " entries left"
556+
document.getElementById('connection-overlay-progressbar-label-gift').textContent = "Ahead - " + (curr_want_entries - min_entries) + " entries left"
557557
}
558558
}
559559

android/tinySSB/app/src/main/java/nz/scuttlebutt/tremolavossbol/WebAppInterface.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class WebAppInterface(val act: MainActivity, val webView: WebView) {
9999
}
100100
"importSecret" -> {
101101
act.idStore.setNewIdentity(Base64.decode(args[1], Base64.NO_WRAP))
102-
act.tinyRepo.repo_reset()
102+
act.tinyRepo.reset()
103103

104104
// restart App
105105
if (act.websocket != null)

0 commit comments

Comments
 (0)