From 896ff9032bec7567b7fa81885316a7c34cf08b3b Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 15 Sep 2020 22:42:13 +0200
Subject: [PATCH] now, g1sms wallet name can be choosen with "N pseudo" (if
 pseudo is not G1member)

---
 g1sms/functions.sh | 4 +++-
 g1sms/sms_NEW.sh   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index 51e5324..c336268 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -264,7 +264,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 	# (NO PIN) = FIRST ACCOUNT: Create wallet 
 	if [ ! -f "$PINFILE" ]; then
         # NOSMS mode?
-		if [[ $2 == "NOSMS" ]]; then UNKNOWN="unknown"; return; fi
+		if [[ "$2" == "NOSMS" && "$3" == "" ]]; then UNKNOWN="unknown"; return; fi
 		mkdir -p /home/$YOU/.zen/g1sms/$PHONE/
         
         #######################
@@ -278,6 +278,8 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         while [[ $(grep -Rwl "$UIDNA$TAIL" /home/$YOU/.zen/ipfs_swarm/.*/G1SMS/_uidna 2>/dev/null) ]]; do
             UIDNA=N1$(/home/$YOU/.zen/astroport/zen/tools/diceware.sh 1 | xargs); done
         UIDNA="$UIDNA$TAIL"
+        # Choosen pseudo
+        [[ "$3" != "" ]] && UIDNA="$3"
         echo "$UIDNA" > "$UIDNAFILE"
 
         #######################
diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh
index 146f2a3..d7f2ee4 100755
--- a/g1sms/sms_NEW.sh
+++ b/g1sms/sms_NEW.sh
@@ -22,11 +22,11 @@ if [[ "$MEMBERUID" != "" && "$MEMBERUID" != "N" && "$MEMBERUID" != "D" && "$MEMB
 	VIRDEST=$MEMBERUID
 	MEMRIB=$(sms_uid2key "$MEMBERUID" "$PHONE" "$PIN")
     log "# MEMRIB: $MEMRIB"
-	[[ $MEMRIB == "" ]] && sms_SEND "$PHONE" "Nous rencontrons un problème pour trouver $MEMBERUID... Rééssayer dans 5 mn" && exit 1
-	MEMBER="$MEMBERUID"
+	[[ $MEMRIB != "" ]] && MEMBER="$MEMBERUID" && MEMBERUID=""
+    [[ $MEMRIB == "" ]] && sms_SEND "$PHONE" "Aucun membre: $MEMBERUID... Création simple portefeuille pour $MEMBERUID" && MEMBER=""
 fi
 
-sms_INIT_ACCOUNT "$PHONE" "NOSMS"
+sms_INIT_ACCOUNT "$PHONE" "NOSMS" "$MEMBERUID"
 # Check account amount
 countvalues=($(check_account))
 log "$(declare -p countvalues)"