IOS-1521 better naming IOS-1521+IOS-1495
authorbuff <andreas@pep-project.org>
Fri, 17 May 2019 10:42:09 +0200
branchIOS-1521+IOS-1495
changeset 86580904d5573fbb
parent 8657 6931187d39ae
child 8659 8db0b20f4307
IOS-1521 better naming
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift
pEpForiOS/UI/EmailDisplayList/PepPictureComposer.swift
pEpForiOS/UI/EmailDisplayList/ProfilePictureComposer.swift
pEpForiOS/UI/EmailDisplayList/ProfilePictureComposerProtocol.swift
     1.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Thu May 16 18:51:12 2019 +0200
     1.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Fri May 17 10:42:09 2019 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4  		0033C07F20D7EBD500224E61 /* ThreadedEmailViewModel+UpdateThreadDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0033C07E20D7EBD500224E61 /* ThreadedEmailViewModel+UpdateThreadDelegate.swift */; };
     1.5  		0033C08120D7F3C600224E61 /* ThreadViewController+ViewModelDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0033C08020D7F3C600224E61 /* ThreadViewController+ViewModelDelegate.swift */; };
     1.6  		0033C08320D7F41600224E61 /* ThreadedEmailViewModelDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0033C08220D7F41600224E61 /* ThreadedEmailViewModelDelegate.swift */; };
     1.7 -		0038494A20D25576008000EA /* ProfilePictureComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0038494920D25576008000EA /* ProfilePictureComposer.swift */; };
     1.8 +		0038494A20D25576008000EA /* ProfilePictureComposerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0038494920D25576008000EA /* ProfilePictureComposerProtocol.swift */; };
     1.9  		0038494C20D2587F008000EA /* PepPictureComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0038494B20D2587F008000EA /* PepPictureComposer.swift */; };
    1.10  		004422C82179E3C500BDF6DF /* SettingsCellViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 004422C72179E3C500BDF6DF /* SettingsCellViewModelTest.swift */; };
    1.11  		004422CA2179ECD600BDF6DF /* PassiveModeViewModelTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 004422C92179ECD600BDF6DF /* PassiveModeViewModelTest.swift */; };
    1.12 @@ -498,7 +498,7 @@
    1.13  		0033C07E20D7EBD500224E61 /* ThreadedEmailViewModel+UpdateThreadDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadedEmailViewModel+UpdateThreadDelegate.swift"; sourceTree = "<group>"; };
    1.14  		0033C08020D7F3C600224E61 /* ThreadViewController+ViewModelDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThreadViewController+ViewModelDelegate.swift"; sourceTree = "<group>"; };
    1.15  		0033C08220D7F41600224E61 /* ThreadedEmailViewModelDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadedEmailViewModelDelegate.swift; sourceTree = "<group>"; };
    1.16 -		0038494920D25576008000EA /* ProfilePictureComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePictureComposer.swift; sourceTree = "<group>"; };
    1.17 +		0038494920D25576008000EA /* ProfilePictureComposerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfilePictureComposerProtocol.swift; sourceTree = "<group>"; };
    1.18  		0038494B20D2587F008000EA /* PepPictureComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PepPictureComposer.swift; sourceTree = "<group>"; };
    1.19  		004422C72179E3C500BDF6DF /* SettingsCellViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCellViewModelTest.swift; sourceTree = "<group>"; };
    1.20  		004422C92179ECD600BDF6DF /* PassiveModeViewModelTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassiveModeViewModelTest.swift; sourceTree = "<group>"; };
    1.21 @@ -1018,7 +1018,7 @@
    1.22  			isa = PBXGroup;
    1.23  			children = (
    1.24  				000D3C2E20D12BFD006B11B2 /* MessageViewModel.swift */,
    1.25 -				0038494920D25576008000EA /* ProfilePictureComposer.swift */,
    1.26 +				0038494920D25576008000EA /* ProfilePictureComposerProtocol.swift */,
    1.27  				0038494B20D2587F008000EA /* PepPictureComposer.swift */,
    1.28  			);
    1.29  			name = Row;
    1.30 @@ -2699,7 +2699,7 @@
    1.31  				4315E4C3201242BB00F68763 /* OAuth2Type+Extension.swift in Sources */,
    1.32  				4351C2D11F4441190053381F /* houdini_html_u.c in Sources */,
    1.33  				B70A3C401E817CFA0036876F /* FolderViewModel.swift in Sources */,
    1.34 -				0038494A20D25576008000EA /* ProfilePictureComposer.swift in Sources */,
    1.35 +				0038494A20D25576008000EA /* ProfilePictureComposerProtocol.swift in Sources */,
    1.36  				15874BCA2127493E00A3A4A6 /* UnecryptedSubjectViewModel.swift in Sources */,
    1.37  				220DCE341E0AB5CC002FE716 /* MailinglistCell.swift in Sources */,
    1.38  				43AA825D1E9BD60600ABD5A8 /* AttachmentsViewDelegate.swift in Sources */,
     2.1 --- a/pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift	Thu May 16 18:51:12 2019 +0200
     2.2 +++ b/pEpForiOS/UI/EmailDisplayList/MessageViewModel.swift	Fri May 17 10:42:09 2019 +0200
     2.3 @@ -35,7 +35,7 @@
     2.4      var isFlagged: Bool = false
     2.5      var isSeen: Bool = false
     2.6      var dateText: String
     2.7 -    var profilePictureComposer: ProfilePictureComposer
     2.8 +    var profilePictureComposer: ProfilePictureComposerProtocol
     2.9      var body: NSAttributedString {
    2.10              return getBodyMessage()
    2.11      }
     3.1 --- a/pEpForiOS/UI/EmailDisplayList/PepPictureComposer.swift	Thu May 16 18:51:12 2019 +0200
     3.2 +++ b/pEpForiOS/UI/EmailDisplayList/PepPictureComposer.swift	Fri May 17 10:42:09 2019 +0200
     3.3 @@ -10,7 +10,7 @@
     3.4  import MessageModel
     3.5  import PEPObjCAdapterFramework
     3.6  
     3.7 -class PepProfilePictureComposer: ProfilePictureComposer {
     3.8 +class PepProfilePictureComposer: ProfilePictureComposerProtocol {
     3.9  
    3.10      let contactImageTool = IdentityImageTool()
    3.11  
     4.1 --- a/pEpForiOS/UI/EmailDisplayList/ProfilePictureComposer.swift	Thu May 16 18:51:12 2019 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,24 +0,0 @@
     4.4 -//
     4.5 -//  ProfilePictureRetriever.swift
     4.6 -//  pEp
     4.7 -//
     4.8 -//  Created by Borja González de Pablo on 14/06/2018.
     4.9 -//  Copyright © 2018 p≡p Security S.A. All rights reserved.
    4.10 -//
    4.11 -
    4.12 -import Foundation
    4.13 -import MessageModel
    4.14 -
    4.15 -protocol ProfilePictureComposer { //!!!: BUFF: remnamen (xyzProtocol)
    4.16 -    /**
    4.17 -     Retrieves a profile picture (if any) for the given identity.
    4.18 -     */
    4.19 -    func profilePicture(for identityKey: IdentityImageTool.IdentityKey,
    4.20 -                        completion: @escaping (UIImage?) -> ())
    4.21 -
    4.22 -    /**
    4.23 -     Retrieves a status icon matching the status of the given message.
    4.24 -     */
    4.25 -    func securityBadge(for message: Message, completion: @escaping (UIImage?) -> ())
    4.26 -
    4.27 -}
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/pEpForiOS/UI/EmailDisplayList/ProfilePictureComposerProtocol.swift	Fri May 17 10:42:09 2019 +0200
     5.3 @@ -0,0 +1,24 @@
     5.4 +//
     5.5 +//  ProfilePictureRetriever.swift
     5.6 +//  pEp
     5.7 +//
     5.8 +//  Created by Borja González de Pablo on 14/06/2018.
     5.9 +//  Copyright © 2018 p≡p Security S.A. All rights reserved.
    5.10 +//
    5.11 +
    5.12 +import Foundation
    5.13 +import MessageModel
    5.14 +
    5.15 +protocol ProfilePictureComposerProtocol {
    5.16 +    /**
    5.17 +     Retrieves a profile picture (if any) for the given identity.
    5.18 +     */
    5.19 +    func profilePicture(for identityKey: IdentityImageTool.IdentityKey,
    5.20 +                        completion: @escaping (UIImage?) -> ())
    5.21 +
    5.22 +    /**
    5.23 +     Retrieves a status icon matching the status of the given message.
    5.24 +     */
    5.25 +    func securityBadge(for message: Message, completion: @escaping (UIImage?) -> ())
    5.26 +
    5.27 +}