Merge pull request #709 from nanu-c/version1.9.0

Version1.0.9

app/config/config.go

@@ -18,7 +18,7 @@ import (
 
 const AppName = "textsecure.nanuc"
 
-const AppVersion = "1.0.8"
+const AppVersion = "1.0.9"
 
 // Do not allow sending attachments larger than 100M for now
 const MaxAttachmentSize int64 = 100 * 1024 * 1024

app/webserver/helpers.go

@@ -240,36 +240,41 @@ func joinGroup(joinGroupmessage JoinGroupMessage) *store.Session {
 	log.Infoln("[axolotl] joinGroup", joinGroupmessage.ID)
 	group, err := textsecure.JoinGroup(joinGroupmessage.ID)
 	if err != nil {
-		// update group also in the case that the group is already joined to remove the join message
-		if group != nil {
-			session, _ := store.SessionsModel.GetByUUID(group.Hexid)
-			session.Name = group.DecryptedGroup.Title
-			session.GroupJoinStatus = group.JoinStatus
-			store.UpdateSession(session)
+		log.Warnln("[axolotl] error while joining group", err)
+		if group == nil {
+			log.Errorln("[axolotl] joinGroup failed")
+			return nil
 		}
-		log.Errorln("[axolotl] joinGroup", err)
-		ShowError(err.Error())
-		return nil
+		// in this case the group is already joined. Its join status has to be updated
 	}
-	log.Infoln("[axolotl] joining group was succesful", group.Hexid)
 	members := ""
-	for _, member := range group.DecryptedGroup.Members {
-		members = members + string(member.Uuid) + ","
+	// members cannot be read if the group is not yet joined
+	if group.JoinStatus == store.GroupJoinStatusJoined {
+		log.Infoln("[axolotl] joining group was successful", group.Hexid)
+		for _, member := range group.DecryptedGroup.Members {
+			members = members + string(member.Uuid) + ","
+		}
 	}
-	store.Groups[group.Hexid] = &store.GroupRecord{
+
+	storeGroup := &store.GroupRecord{
 		GroupID:    group.Hexid,
 		Name:       group.DecryptedGroup.Title,
 		Members:    members,
-		JoinStatus: store.GroupJoinStatusJoined,
+		JoinStatus: group.JoinStatus,
 	}
-	store.SaveGroup(store.Groups[group.Hexid])
+	store.Groups[group.Hexid] = storeGroup
+	store.SaveGroup(storeGroup)
 	session, _ := store.SessionsModel.GetByUUID(group.Hexid)
 	session.Name = group.DecryptedGroup.Title
-	session.GroupJoinStatus = store.GroupJoinStatusJoined
-	msg := session.Add("You accepted the invitation to the group.", "", []store.Attachment{}, "", true, store.ActiveSessionID)
-	msg.Flags = helpers.MsgFlagGroupJoined
+	session.GroupJoinStatus = group.JoinStatus
+	// Add a join message to the session when the group is joined
+	if group.JoinStatus == store.GroupJoinStatusJoined {
+		msg := session.Add("You accepted the invitation to the group.", "", []store.Attachment{}, "", true, store.ActiveSessionID)
+		msg.Flags = helpers.MsgFlagGroupJoined
+		store.SaveMessage(msg)
+		MessageHandler(msg)
+	}
 	store.UpdateSession(session)
-	store.SaveMessage(msg)
 	requestEnterChat(store.ActiveSessionID)
 	sendContactList()
 	return session

appimage/AppDir/axolotl.appdata.xml

@@ -29,6 +29,9 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="1.0.9" date="2022-01-06">
+            <url>https://github.com/nanu-c/axolotl/releases/tag/v1.0.9</url>
+        </release>
         <release version="1.0.8" date="2021-11-21">
             <url>https://github.com/nanu-c/axolotl/releases/tag/v1.0.8</url>
         </release>

docs/CHANGELOG.md

@@ -1,6 +1,25 @@
-prerelease :
+1.0.9 (Jan 6 2021)
 ------------------------------------
 * Fix 'Verifiy Identity' (blackoverflow)
+* Fix option to mute groups (blackoverflow)
+* Fix links opening inside of axolotl on ubuntu touch (blackoverflow)
+* Fix rendering of expire timer in chats with self destroying messages (blackoverflow)
+* Remove "Upstream Changes" Warning Message (nuehm-arno)
+* Add support for voice notes (Note:needs ota21 on ut) (nanu-c)
+* Add support for joining groups (nanu-c)
+* Fix opening document attachments (blackoverflow)
+* Fix Messages with special characters (e.g. "<") not displayed correctly (blackoverflow)
+* Introduced Chai+Mocha for Vue unit tests (blackoverflow)
+* Update nvm Node to 16.13.1 to fix building (nalysius)
+* Update many dependencies (dependabot)
+* Fix building axolotl-web with clickable (nanu-c)
+* Improve documentation (danfro)
+* Update german translation (danfro)
+* Fix linter and test warning (blackoverflow)
+* Fix receiving messages by waking up crayfish childprocess from sleep (nanu-c)
+* Support QtWebEngine with Browserslist -> fix correct legacy compiling for ut (blackoverflow)
+* Fix building snaps for amd64 (armhf and arm64 is still broken) (nanu-c)
+* Make editing contacts accessible via icon (blackoverflow)
 
 1.0.8 (Nov 21 2021)
 ------------------------------------

docs/INSTALL.md

@@ -128,7 +128,7 @@ To build the application, use the following command from the root of this reposi
 
 To install the built snap, use snap:
 
-`sudo snap install axolotl_1.0.8_amd64.snap --dangerous`
+`sudo snap install axolotl_1.0.9_amd64.snap --dangerous`
 
 **Run**
 

flatpak/org.nanuc.Axolotl.appdata.xml

@@ -29,6 +29,9 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="1.0.9" date="2022-01-06">
+            <url>https://github.com/nanu-c/axolotl/releases/tag/v1.0.9</url>
+        </release>
         <release version="1.0.8" date="2021-11-21">
             <url>https://github.com/nanu-c/axolotl/releases/tag/v1.0.8</url>
         </release>

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "textsecure.nanuc",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "A Signal compatible messaging client for Ubuntu phones",
     "title": "Axolotl",
     "architecture": "@CLICK_ARCH@",

snap/snapcraft.yaml

@@ -6,7 +6,7 @@ grade: stable
 confinement: strict
 base: core20
 icon: snap/gui/axolotl.png
-version: "1.0.8"
+version: "1.0.9"
 architectures:
   - build-on: amd64
   - build-on: arm64