fixes

Author: Hirobreak

ShareExtension/ComposerUIView.swift

@@ -137,7 +137,7 @@ class ComposerUIView: UIView {
     }
 
     func setFrom(account: Account) {
-        let accounts = Array(SharedDB.getAccounts(ignore: account.username))
+        let accounts = Array(SharedDB.getAccounts(ignore: account.compoundKey))
         fromButton.isHidden = accounts.count == 0
         let attributedFrom = NSMutableAttributedString(string: "\(String.localize("FROM")): ", attributes: [.font: Font.bold.size(15)!])
         let attributedEmail = NSAttributedString(string: account.email, attributes: [.font: Font.regular.size(15)!])

iOS-Email-Client/Controllers/ComposeViewController.swift

@@ -233,7 +233,7 @@ class ComposeViewController: UIViewController {
     }
 
     func setFrom(account: Account) {
-        let accounts = Array(DBManager.getAccounts(ignore: account.username))
+        let accounts = Array(DBManager.getAccounts(ignore: account.compoundKey))
         fromButton.isHidden = accounts.count == 0 || (composerData.threadId != nil && composerData.threadId != composerData.emailDraft?.key.description)
         fromButton.setImage(UIImage(named: "icon-down"), for: .normal)
         activeAccount = account

iOS-Email-Client/Interfaces/EmailMoreOptionsInterface.swift

@@ -29,6 +29,7 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
         case forward
         case delete
         case mark
+        case notSpam
         case spam
         case unsend
         case print
@@ -47,8 +48,10 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
                 return String.localize("DELETE")
             case .mark:
                 return String.localize("MARK_FROM_HERE")
+            case .notSpam:
+                return String.localize("REMOVE_SPAM")
             case .spam:
-                return String.localize("SPAM")
+                return String.localize("MARK_SPAM")
             case .unsend:
                 return String.localize("UNSEND")
             case .print:
@@ -66,8 +69,15 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
     var delegate: EmailMoreOptionsInterfaceDelegate?
 
     init(email: Email) {
-        options = [.reply, .replyAll, .delete, .mark, .spam]
-        optionsCount = 5
+        options = [.reply, .replyAll, .delete, .mark]
+        optionsCount = 4
+        if (email.isSpam) {
+            options.append(.notSpam)
+            optionsCount += 1
+        } else {
+            options.append(.spam)
+            optionsCount += 1
+        }
         if (email.secure && email.status != .unsent && email.status != .none && email.status != .sending && email.status != .fail) {
             options.append(.unsend)
             optionsCount += 1
@@ -106,6 +116,8 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
             delegate?.onDeletePress()
         case .mark:
             delegate?.onMarkPress()
+        case .notSpam:
+            delegate?.onSpamPress()
         case .spam:
             delegate?.onSpamPress()
         case .unsend:

iOS-Email-Client/Libs/Env.swift

@@ -49,7 +49,7 @@ struct Env {
         guard !Env.isProduction else {
             return "wss://socket.criptext.com"
         }
-        return "wss://windowsocket.criptext.com"
+        return "wss://socket.criptext.com"
     }
 
     static var domain: String {

iOS-Email-Client/Shared/SharedDB.swift

@@ -45,9 +45,9 @@ class SharedDB {
         return realm?.object(ofType: Account.self, forPrimaryKey: id)
     }
 
-    class func getAccounts(ignore username: String) -> Results<Account> {
+    class func getAccounts(ignore accountId: String) -> Results<Account> {
         let realm = try! Realm()
-        return realm.objects(Account.self).filter("isLoggedIn == true AND username != '\(username)'")
+        return realm.objects(Account.self).filter("isLoggedIn == true AND compoundKey != '\(accountId)'")
     }
 
     class func getAllAccounts() -> [Account] {