fix: address feedback

openedx · Feb 21, 2025 · 62cf2ad · 62cf2ad
1 parent 5a7fbc1
commit 62cf2ad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/Core/Core/Data/Model/Data_UserProfile.swift b/Core/Core/Data/Model/Data_UserProfile.swift
@@ -71,12 +71,13 @@ public enum AccountPrivacy: String, Codable, Sendable {
     case privateAccess = "private"
     case allUsers = "all_users"
     case allUsersBig = "ALL_USERS"
+    case custom = "custom"
 
     public var boolValue: Bool {
         switch self {
         case .privateAccess:
             return false
-        case .allUsers, .allUsersBig:
+        case .allUsers, .allUsersBig, .custom:
             return true
         }
     }

diff --git a/Profile/Profile/Presentation/EditProfile/EditProfileViewModel.swift b/Profile/Profile/Presentation/EditProfile/EditProfileViewModel.swift
@@ -138,7 +138,7 @@ public class EditProfileViewModel: ObservableObject {
         isShowProgress = true
         do {
             if try await interactor.deleteProfilePicture() {
-                inputImage = CoreAssets.noAvatar.image
+//                inputImage = CoreAssets.noAvatar.image
                 isShowProgress = false
             }
         } catch {
@@ -246,24 +246,14 @@ public class EditProfileViewModel: ObservableObject {
     @MainActor
     func uploadData(parameters: [String: any Any & Sendable]) async {
         do {
-            if profileChanges.isAvatarDeleted {
+            if profileChanges.isAvatarDeleted || profileChanges.profileType == .limited {
                 try await deleteAvatar()
                 profileChanges.isAvatarChanged = false
                 profileChanges.isAvatarDeleted = false
                 profileChanges.isAvatarSaved = true
-                checkChanges()
             }
-            if profileChanges.isAvatarChanged {
-                if let newImage = inputImage?.jpegData(compressionQuality: 80) {
-                    isShowProgress = true
-                    try await interactor.uploadProfilePicture(pictureData: newImage)
-                    isShowProgress = false
-                    profileChanges.isAvatarChanged = false
-                    profileChanges.isAvatarSaved = true
-                    checkChanges()
-                }
-            }
-
+            checkChanges()
+
             if isChanged {
                 if !parameters.isEmpty {
                     isShowProgress = true
@@ -276,6 +266,18 @@ public class EditProfileViewModel: ObservableObject {
                 }
                 isChanged = false
             }
+
+            if profileChanges.profileType == .full {
+                if let newImage = inputImage?.jpegData(compressionQuality: 80) {
+                    isShowProgress = true
+                    try await interactor.uploadProfilePicture(pictureData: newImage)
+                    isShowProgress = false
+                    profileChanges.isAvatarChanged = false
+                    profileChanges.isAvatarSaved = true
+                    checkChanges()
+                }
+            }
+
         } catch {
             isShowProgress = false
             if error.isInternetError {