From 0e6909845fe5635ca3c9ba9c40685ca4d6c7ca1c Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Wed, 28 Dec 2022 16:59:25 +0000
Subject: [PATCH] mobile: preserve group description in profile (#1658)

---
 .../app/src/main/java/chat/simplex/app/model/ChatModel.kt | 1 +
 .../chat/simplex/app/views/chat/group/GroupProfileView.kt | 8 +++++++-
 .../xcshareddata/swiftpm/Package.resolved                 | 2 +-
 .../xcshareddata/xcschemes/SimpleX (iOS).xcscheme         | 2 +-
 apps/ios/SimpleXChat/ChatTypes.swift                      | 4 +++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
index f3f88e5b3..439d267de 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
@@ -769,6 +769,7 @@ data class GroupInfo (
 data class GroupProfile (
   override val displayName: String,
   override val fullName: String,
+  val description: String? = null,
   override val image: String? = null,
   override val localAlias: String = "",
   val groupPreferences: GroupPreferences? = null
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt
index cf50249df..ce2084863 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt
@@ -136,7 +136,13 @@ fun GroupProfileLayout(
               if (enabled) {
                 Text(
                   stringResource(R.string.save_group_profile),
-                  modifier = Modifier.clickable { saveProfile(GroupProfile(displayName.value, fullName.value, profileImage.value)) },
+                  modifier = Modifier.clickable {
+                    saveProfile(groupProfile.copy(
+                      displayName = displayName.value,
+                      fullName = fullName.value,
+                      image = profileImage.value
+                    ))
+                  },
                   color = MaterialTheme.colors.primary
                 )
               } else {
diff --git a/apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index fae90a039..146d9f805 100644
--- a/apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/apps/ios/SimpleX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,7 +15,7 @@
       "location" : "https://github.com/kirualex/SwiftyGif",
       "state" : {
         "branch" : "master",
-        "revision" : "4a6f5bad863c5365b192f8441f62c713ecff62bd"
+        "revision" : "5e8619335d394901379c9add5c4c1c2f420b3800"
       }
     }
   ],
diff --git a/apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX (iOS).xcscheme b/apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX (iOS).xcscheme
index 9be28f4ca..8b60dc4fa 100644
--- a/apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX (iOS).xcscheme	
+++ b/apps/ios/SimpleX.xcodeproj/xcshareddata/xcschemes/SimpleX (iOS).xcscheme	
@@ -44,7 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableUBSanitizer = "YES"
+      enableAddressSanitizer = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index f97a46977..30b5f9097 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -1364,15 +1364,17 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat {
 }
 
 public struct GroupProfile: Codable, NamedChat {
-    public init(displayName: String, fullName: String, image: String? = nil, groupPreferences: GroupPreferences? = nil) {
+    public init(displayName: String, fullName: String, description: String? = nil, image: String? = nil, groupPreferences: GroupPreferences? = nil) {
         self.displayName = displayName
         self.fullName = fullName
+        self.description = description
         self.image = image
         self.groupPreferences = groupPreferences
     }
 
     public var displayName: String
     public var fullName: String
+    public var description: String?
     public var image: String?
     public var groupPreferences: GroupPreferences?
     public var localAlias: String { "" }