Merge pull request #852 from AlphaWallet/remove-build-warnings

Remove build warnings

AlphaWallet/AppCoordinator.swift

@@ -163,7 +163,7 @@ class AppCoordinator: NSObject, Coordinator {
         WalletCoordinator(keystore: keystore).createInitialWallet()
     }
 
-    func handleUniversalLink(url: URL) -> Bool {
+    @discardableResult func handleUniversalLink(url: URL) -> Bool {
         createInitialWallet()
         closeWelcomeWindow()
         guard let ethPrice = self.ethPrice, let ethBalance = self.ethBalance else { return false }

AlphaWallet/AssetDefinition/AssetDefinitionDiskBackingStore.swift

@@ -83,7 +83,7 @@ class AssetDefinitionDiskBackingStore: AssetDefinitionBackingStore {
         directoryWatcher = DirectoryContentsWatcher.Local(path: directory.path)
         do {
             try directoryWatcher?.start { [weak self] results in
-                guard let strongSelf = self else { return }
+                guard self != nil else { return }
                 switch results {
                 case .noChanges:
                     break

AlphaWallet/AssetDefinition/Coordinators/AssetDefinitionStoreCoordinator.swift

@@ -109,7 +109,7 @@ class AssetDefinitionStoreCoordinator: Coordinator {
         directoryWatcher = DirectoryContentsWatcher.Local(path: directory.path)
         do {
             try directoryWatcher?.start { [weak self] results in
-                guard let strongSelf = self else { return }
+                guard self != nil else { return }
                 switch results {
                 case .noChanges:
                     break

AlphaWallet/EtherClient/OpenSea.swift

@@ -72,7 +72,7 @@ class OpenSea {
                 headers: ["X-API-KEY": Constants.openseaAPIKEY]
         ).responseJSON { response in
             guard let data = response.data, let json = try? JSON(data: data) else {
-                completion(.failure(AnyError(OpenSeaError(localizedDescription: "Error calling \(Constants.openseaAPI) API: \(response.error)"))))
+                completion(.failure(AnyError(OpenSeaError(localizedDescription: "Error calling \(Constants.openseaAPI) API: \(String(describing: response.error))"))))
                 return
             }
             DispatchQueue.global(qos: .userInitiated).async {

AlphaWallet/Market/Coordinators/UniversalLinkCoordinator.swift

@@ -395,7 +395,7 @@ class UniversalLinkCoordinator: Coordinator {
                 }
             }
 
-            guard let vc = strongSelf.importTokenViewController, case .ready(var viewModel) = vc.state else { return }
+            guard let vc = strongSelf.importTokenViewController, case .ready = vc.state else { return }
             // TODO handle http response
             print(result)
             if successful {

AlphaWallet/Tokens/Coordinators/TokensCoordinator.swift

@@ -97,7 +97,7 @@ class TokensCoordinator: Coordinator {
             let contractsToAdd = detectedContracts - alreadyAddedContracts - deletedContracts - hiddenContracts - delegateContracts
             var contractsPulled = 0
             var hasRefreshedAfterAddingAllContracts = false
-            DispatchQueue.global().async { [weak strongSelf] in
+            DispatchQueue.global().async { [weak self] in
                 guard let strongSelf = self else { return }
                 for eachContract in contractsToAdd {
                     strongSelf.addToken(for: eachContract) {

AlphaWallet/Tokens/Types/TokensDataStore.swift

@@ -222,7 +222,7 @@ class TokensDataStore {
         var knownToBeNotERC721 = false
         var knownToBeNotERC875 = false
         getIsERC875ContractCoordinator.getIsERC875Contract(for: address!) { [weak self] result in
-            guard let strongSelf = self else { return }
+            guard self != nil else { return }
             switch result {
             case .success(let isERC875):
                 if isERC875 {
@@ -240,7 +240,7 @@ class TokensDataStore {
         }
 
         getIsERC721ContractCoordinator.getIsERC721Contract(for: address!) { [weak self] result in
-            guard let strongSelf = self else { return }
+            guard self != nil else { return }
             switch result {
             case .success(let isERC721):
                 if isERC721 {

AlphaWallet/Tokens/ViewControllers/TokensViewController.swift

@@ -144,7 +144,7 @@ class TokensViewController: UIViewController {
                 tableView.reloadData()
             }
             if viewModel.shouldShowCollectiblesCollectionView {
-                var contractsForCollectibles = contractsForCollectiblesFromViewModel()
+                let contractsForCollectibles = contractsForCollectiblesFromViewModel()
                 if contractsForCollectibles != currentCollectiblesContractsDisplayed {
                     currentCollectiblesContractsDisplayed = contractsForCollectibles
                     collectiblesCollectionView.reloadData()

AlphaWallet/Tokens/ViewModels/OpenSea/OpenSeaNonFungibleTokenDisplayHelper.swift

@@ -502,8 +502,6 @@ enum OpenSeaNonFungibleTokenDisplayHelper: String {
             return "exp"
         case .bc:
             return "generation"
-        case .bc:
-            return nil
         case .cbt:
             return "generation"
         case .ck:

AlphaWallet/Transfer/ViewControllers/RequestViewController.swift

@@ -155,7 +155,7 @@ class RequestViewController: UIViewController {
 		DispatchQueue.global(qos: .background).async { [weak self] in
             guard let strongSelf = self else { return }
 			let image = strongSelf.generateQRCode(from: string)
-			DispatchQueue.main.async { [weak self] in
+			DispatchQueue.main.async {
 				strongSelf.imageView.image = image
 			}
 		}

AlphaWallet/Transfer/ViewControllers/SendViewController.swift

@@ -353,7 +353,7 @@ class SendViewController: UIViewController, CanScanQRCode, TokenVerifiableStatus
                 // EIP67 format not being used much yet, use hex value for now
                 // let string = "ethereum:\(account.address.address)?value=\(value)"
                 let image = strongSelf.generateQRCode(from: string)
-                DispatchQueue.main.async { [weak self] in
+                DispatchQueue.main.async {
                     strongSelf.imageView.image = image
                 }
             }

AlphaWallet/Transfer/ViewModels/ConfirmSignMessageViewControllerViewModel.swift

@@ -78,7 +78,7 @@ struct ConfirmSignMessageViewControllerViewModel {
                 return data.hexEncoded
             }
             return message
-        case .typedMessage(let (typedData)):
+        case .typedMessage:
             return nil
         }
     }