IOS-1226 merge in default IOS-1226
authorDirk Zimmermann <dirk@pep-project.org>
Thu, 16 Aug 2018 11:54:53 +0200
branchIOS-1226
changeset 5848e06bea5baf07
parent 5847 6ca81a0314de
parent 5846 996278780e43
child 5850 11fdaba12c1d
IOS-1226 merge in default
pEpForiOS/UI/EmailDisplayList/EmailListViewModel.swift
pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift
     1.1 --- a/pEpForiOS/UI/EmailDisplayList/EmailListViewModel.swift	Thu Aug 16 11:54:26 2018 +0200
     1.2 +++ b/pEpForiOS/UI/EmailDisplayList/EmailListViewModel.swift	Thu Aug 16 11:54:53 2018 +0200
     1.3 @@ -276,9 +276,6 @@
     1.4          var deletees = [MessageViewModel]()
     1.5          indexPaths.forEach { (ip) in
     1.6              guard let previewMessage = messages.object(at: ip.row)else {
     1.7 -                Log.shared.errorAndCrash(component: #function,
     1.8 -                                         errorString: "There are valid cases, so we should not crash here. Will crash here for debug reasons to pinpoint the root of IOS-1243. Please remove this Log command after IOS-1243 is fixed." +
     1.9 -                    "Extra anoying long string to not forget please.")
    1.10                      return
    1.11              }
    1.12              deletees.append(previewMessage)
     2.1 --- a/pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift	Thu Aug 16 11:54:26 2018 +0200
     2.2 +++ b/pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift	Thu Aug 16 11:54:53 2018 +0200
     2.3 @@ -208,9 +208,6 @@
     2.4                                     accountAddress: accountAddress)
     2.5              else {
     2.6                  // The model has changed.
     2.7 -                Log.shared.errorAndCrash(component: #function,
     2.8 -                                         errorString: "There are valid cases, so we should not crash here. Will crash here for debug reasons to pinpoint the root of IOS-1243. Please remove this Log command after IOS-1243 is fixed." +
     2.9 -                    "Extra anoying long string to not forget please.")
    2.10                  return nil
    2.11          }
    2.12          return msg
     3.1 --- a/pEpForiOS/UI/EmailDisplayList/PreviewMessage.swift	Thu Aug 16 11:54:26 2018 +0200
     3.2 +++ b/pEpForiOS/UI/EmailDisplayList/PreviewMessage.swift	Thu Aug 16 11:54:53 2018 +0200
     3.3 @@ -78,9 +78,6 @@
     3.4                                     folderName: parentFolderName,
     3.5                                     accountAddress: address)
     3.6              else {
     3.7 -                Log.shared.errorAndCrash(component: #function,
     3.8 -                                         errorString: "There are valid cases, so we should not crash here. Will crash here for debug reasons to pinpoint the root of IOS-1243. Please remove this Log command after IOS-1243 is fixed." +
     3.9 -                    "Extra anoying long string to not forget please.")
    3.10                  // The model has changed.
    3.11                  return nil
    3.12          }