Fix minor issues

Fixing Issue with alias when scanning contact
Making error message more accurate when a contact at trust level 2 is being set to trust level 2

Author: adgohar

android/tinySSB/app/src/main/assets/web/prod/contacts.js

@@ -194,6 +194,11 @@ function show_contact_details(id) {
 
         // Example condition for error
         if (sliderValue == 2) {
+            //check if current trust level is 2
+            if (c['trusted'] == 2) {
+                errorMessage.textContent = "Error: Contact's trust level is already 2.";
+                return;
+            }
             errorMessage.textContent = "Error: To set a contact's trust level to 2, you must scan their QR Code.";
         } else {
             errorMessage.textContent = ''; // Clear any previous errors

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

@@ -69,22 +69,24 @@ function edit_confirmed() {
         load_chat(curr_chat)
         // menu_redraw();
     } else if (edit_target == 'new_contact_alias' || edit_target == 'trust_wifi_peer') {
+        backend("add:contact " + new_contact_id + " " + btoa(val) + " T");
         document.getElementById('contact_id').value = '';
         if (val == '')
             val = id2b32(new_contact_id);
+        console.log("new contact alias: " + val)
         tremola.contacts[new_contact_id] = {
             "alias": val, "initial": val.substring(0, 1).toUpperCase(),
             "color": colors[Math.floor(colors.length * Math.random())],
             "iam": "", "forgotten": false
         };
+        console.log("new contact: " + JSON.stringify(tremola.contacts[new_contact_id]))
         var recps = [myId, new_contact_id];
         var nm = recps2nm(recps);
         tremola.chats[nm] = {
             "alias": "Chat w/ " + val, "posts": {}, "members": recps,
             "touched": Date.now(), "lastRead": 0, "timeline": new Timeline()
         };
         persist();
-        backend("add:contact " + new_contact_id + " " + btoa(val))
         menu_redraw();
     } else if (edit_target == 'new_invite_target') {
         backend("invite:redeem " + val)
@@ -382,7 +384,7 @@ function resetTremola() { // wipes browser-side content
         "members": ["ALL"], "touched": Date.now(), "lastRead": 0,
         "timeline": new Timeline()
     };
-    tremola.contacts[myId] = {"alias": "me", "initial": "M", "color": "#bd7578", "iam": "", "forgotten": false};
+    tremola.contacts[myId] = {"alias": "me", "initial": "M", "color": "#bd7578", "iam": "", "forgotten": false, "trusted": 2};
     persist();
 }
 
@@ -733,15 +735,17 @@ function b2f_get_settings(settings) {
     tremola.settings = settings
 }
 
-function b2f_new_contact(fid, trustLevel="untrusted") {
+function b2f_new_contact(fid, trustLevel="untrusted", alias="") {
     console.log(trustLevel);
     let trusted = 0;
     if (trustLevel == "trusted") {
         trusted = 2;
     }
-    var id = id2b32(fid);
+    if (alias == "") {
+        alias = id2b32(fid);
+    }
     tremola.contacts[fid] = {
-        "alias": id, "initial": id.substring(0, 1).toUpperCase(),
+        "alias": alias, "initial": alias.substring(0, 1).toUpperCase(),
         "color": colors[Math.floor(colors.length * Math.random())],
         "iam": "", "forgotten": false, "trusted": trusted
     };

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

@@ -448,8 +448,8 @@ function qr_scan_success(s) {
                         tips = JSON.stringify(ch.timeline.get_tips())
                     }
                     backend("contacts:setTrust " + decodeScuttlebuttId(new_contact_id) + " 2" + " " + tips);
-                } else {
-                    launch_snackbar("This contact already exists");
+                } else if (tremola.contacts[new_contact_id].trusted == 2) {
+                    launch_snackbar("This contact already exists and is verified");
                 }
                 return;
             }
@@ -477,9 +477,6 @@ function qr_scan_confirmed() {
     // c = {alias: a, id: s};
     var i = (a + "?").substring(0, 1).toUpperCase()
     var c = {"alias": a, "initial": i, "color": colors[Math.floor(colors.length * Math.random())], "iam": "", "forgotten": false, "trusted": 2};
-    tremola.contacts[s] = c;
-    persist();
-    backend("add:contact " + s + " " + btoa(a) + "T") //T for trusted
     load_contact_item([s, c]);
     closeOverlay();
 }

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

@@ -188,11 +188,12 @@ class WebAppInterface(val act: MainActivity, val webView: WebView) {
             }
             "add:contact" -> {
                 val contactID = args[1].substring(1,args[1].length-8)
-                val isTrusted = args.getOrNull(2) != null
-                Log.d("ADD", "$contactID $isTrusted")
-                val keyHex = act.tinyGoset._add_key(Base64.decode(contactID, Base64.NO_WRAP), true)
+                val alias = Base64.decode(args[2], Base64.NO_WRAP).decodeToString()
+                val isTrusted = args.getOrNull(3) != null
+                Log.d("add:contact", "contactID: $contactID, isTrusted: $isTrusted, alias: $alias")
+
+                val keyHex = act.tinyGoset._add_key(Base64.decode(contactID, Base64.NO_WRAP), true, alias)
                 if (isTrusted) {
-                    Log.d("trustthismf", "trustthismf")
                     trust_contact(keyHex, 2)
                 }
             }

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

@@ -232,11 +232,11 @@ class GOset(val context: MainActivity) {
         return true
     }
 
-    fun _add_key(key: ByteArray, trusted: Boolean = false): String {
+    fun _add_key(key: ByteArray, trusted: Boolean = false, alias: String =""): String {
         if (!_include_key(key)) // adds key if necessary
             return ""
         //Set trusted
-        context.tinyRepo.add_replica(key, trusted)
+        context.tinyRepo.add_replica(key, trusted, alias)
 
         keys.sortWith({a:ByteArray,b:ByteArray -> byteArrayCmp(a,b)})
         if (keys.size >= largest_claim_span) { // only rebroadcast if we are up to date

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

@@ -76,7 +76,7 @@ class Repo(val context: MainActivity) {
 
     }
 
-    fun add_replica(fid: ByteArray, trusted: Boolean = false) {
+    fun add_replica(fid: ByteArray, trusted: Boolean = false, alias: String = "") {
         if (replicas.any { it.fid.contentEquals(fid) })
             return
         val new_r = Replica(context, File(context.getDir(TINYSSB_DIR, MODE_PRIVATE), FEED_DIR), fid)
@@ -101,7 +101,7 @@ class Repo(val context: MainActivity) {
 
         if(context.frontend_ready) // was: isWaiInitialized()
             if (trusted) {
-                context.wai.eval("b2f_new_contact(\"@${fid.toBase64()}.ed25519\", \"trusted\")") // notify frontend
+                context.wai.eval("b2f_new_contact(\"@${fid.toBase64()}.ed25519\", \"trusted\", \"$alias\")") // notify frontend
             } else {
                 context.wai.eval("b2f_new_contact(\"@${fid.toBase64()}.ed25519\", \"untrusted\")") // notify frontend
             }