Remove Virtual Tags (#1734)

* Remove RuuviVirtual
Removes virtual sensors code

* remove RuuviLocation[Picker]

* fix spm

* fix pods

* fix spm

Modules/RuuviDiscover/Package.swift

@@ -18,7 +18,6 @@ let package = Package(
         .package(path: "../../Packages/RuuviReactor"),
         .package(path: "../../Packages/RuuviLocal"),
         .package(path: "../../Packages/RuuviService"),
-        .package(path: "../../Packages/RuuviVirtual"),
         .package(path: "../../Common/RuuviPresenters"),
         .package(path: "../../Common/RuuviLocalization"),
         .package(url: "https://github.com/ruuvi/BTKit", .upToNextMinor(from: "0.4.3")),
@@ -32,7 +31,6 @@ let package = Package(
                 "RuuviReactor",
                 "RuuviLocal",
                 "RuuviService",
-                "RuuviVirtual",
                 "RuuviPresenters",
                 "BTKit",
                 "RuuviLocalization"

Modules/RuuviDiscover/RuuviDiscover.podspec

@@ -25,7 +25,6 @@ Pod::Spec.new do |s|
     ss.dependency 'RuuviReactor'
     ss.dependency 'RuuviLocal'
     ss.dependency 'RuuviService'
-    ss.dependency 'RuuviVirtual'
     ss.dependency 'RuuviCore'
     ss.dependency 'RuuviLocalization'
     ss.dependency 'RuuviPresenters'

Modules/RuuviDiscover/Sources/RuuviDiscover/RuuviDiscover.swift

@@ -5,16 +5,10 @@ public protocol RuuviDiscover: AnyObject {
     var viewController: UIViewController { get }
     var router: AnyObject? { get set }
     var output: RuuviDiscoverOutput? { get set }
-
-    func onDidPick(location: Location)
 }
 
 public protocol RuuviDiscoverOutput: AnyObject {
     func ruuviDiscoverWantsClose(_ ruuviDiscover: RuuviDiscover)
     func ruuvi(discover: RuuviDiscover, didAdd ruuviTag: AnyRuuviTagSensor)
     func ruuvi(discover: RuuviDiscover, didSelectFromNFC ruuviTag: RuuviTagSensor)
-    // Will be deprecated in near future. Currently retained to support already
-    // added web tags.
-    func ruuviDiscoverWantsPickLocation(_ ruuviDiscover: RuuviDiscover)
-    func ruuvi(discover: RuuviDiscover, didAdd virtualSensor: AnyVirtualTagSensor)
 }

Modules/RuuviDiscover/Sources/RuuviDiscover/RuuviDiscoverFactory.swift

@@ -4,36 +4,29 @@ import RuuviContext
 import RuuviReactor
 import RuuviLocal
 import RuuviService
-import RuuviVirtual
 import RuuviCore
 import RuuviPresenters
 
 public struct RuuviDiscoverDependencies {
-    var virtualReactor: VirtualReactor
     var errorPresenter: ErrorPresenter
     var activityPresenter: ActivityPresenter
-    var virtualService: VirtualService
     var permissionsManager: RuuviCorePermission
     var permissionPresenter: PermissionPresenter
     var foreground: BTForeground
     var ruuviReactor: RuuviReactor
     var ruuviOwnershipService: RuuviServiceOwnership
 
     public init(
-        virtualReactor: VirtualReactor,
         errorPresenter: ErrorPresenter,
         activityPresenter: ActivityPresenter,
-        virtualService: VirtualService,
         permissionsManager: RuuviCorePermission,
         permissionPresenter: PermissionPresenter,
         foreground: BTForeground,
         ruuviReactor: RuuviReactor,
         ruuviOwnershipService: RuuviServiceOwnership
     ) {
-        self.virtualReactor = virtualReactor
         self.errorPresenter = errorPresenter
         self.activityPresenter = activityPresenter
-        self.virtualService = virtualService
         self.permissionsManager = permissionsManager
         self.permissionPresenter = permissionPresenter
         self.foreground = foreground
@@ -47,10 +40,8 @@ public final class RuuviDiscoverFactory {
 
     public func create(dependencies: RuuviDiscoverDependencies) -> RuuviDiscover {
         let presenter = DiscoverPresenter()
-        presenter.virtualReactor = dependencies.virtualReactor
         presenter.errorPresenter = dependencies.errorPresenter
         presenter.activityPresenter = dependencies.activityPresenter
-        presenter.virtualService = dependencies.virtualService
         presenter.permissionsManager = dependencies.permissionsManager
         presenter.permissionPresenter = dependencies.permissionPresenter
         presenter.foreground = dependencies.foreground

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/Presenter/DiscoverPresenter.swift

@@ -8,7 +8,6 @@ import RuuviContext
 import RuuviReactor
 import RuuviLocal
 import RuuviService
-import RuuviVirtual
 import RuuviCore
 import RuuviPresenters
 import CoreBluetooth
@@ -31,10 +30,8 @@ class DiscoverPresenter: NSObject, RuuviDiscover {
     var router: AnyObject?
     weak var output: RuuviDiscoverOutput?
 
-    var virtualReactor: VirtualReactor!
     var errorPresenter: ErrorPresenter!
     var activityPresenter: ActivityPresenter!
-    var virtualService: VirtualService!
     var foreground: BTForeground!
     var permissionsManager: RuuviCorePermission!
     var permissionPresenter: PermissionPresenter!
@@ -264,18 +261,6 @@ extension DiscoverPresenter: DiscoverViewOutput {
     }
 }
 
- extension DiscoverPresenter {
-    func onDidPick(location: Location) {
-        virtualService.add(provider: .openWeatherMap, location: location)
-            .on(success: { [weak self] virtualSensor in
-                guard let sSelf = self else { return }
-                sSelf.output?.ruuvi(discover: sSelf, didAdd: virtualSensor)
-            }, failure: { [weak self] error in
-                self?.errorPresenter.present(error: error)
-            })
-    }
- }
-
 // MARK: - Private
 extension DiscoverPresenter {
     private func startObservingPersistedRuuviSensors() {
@@ -459,21 +444,4 @@ extension DiscoverPresenter {
         return string.replacingOccurrences(of: "\0", with: "")
     }
 }
-
-extension DiscoverPresenter {
-    // Will be deprecated in near future. Currently retained to support already
-    // added web tags.
-    private func persistWebTag(with provider: VirtualProvider) {
-        let operation = virtualService.add(
-            provider: provider,
-            name: "Test Virtual Sensor"
-        )
-        operation.on(success: { [weak self] virtualSensor in
-            guard let sSelf = self else { return }
-            sSelf.output?.ruuvi(discover: sSelf, didAdd: virtualSensor)
-        }, failure: { [weak self] error in
-            self?.errorPresenter.present(error: error)
-        })
-    }
-}
 // swiftlint:enable file_length

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/View/DiscoverViewInput.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 import RuuviOntology
-import RuuviVirtual
 import RuuviLocalization
 
 protocol DiscoverViewInput: UIViewController, Localizable {

Modules/RuuviDiscover/Sources/RuuviDiscover/VMP/View/Table/DiscoverTableViewController.swift

@@ -1,7 +1,6 @@
 import UIKit
 import BTKit
 import RuuviOntology
-import RuuviVirtual
 import RuuviLocalization
 import CoreNFC
 
@@ -68,13 +67,6 @@ extension DiscoverTableViewController: DiscoverViewInput {
         present(alertVC, animated: true)
     }
 
-    func showWebTagInfoDialog() {
-        let message = "DiscoverTable.WebTagsInfoDialog.message".localized(for: Self.self)
-        let alertVC = UIAlertController(title: nil, message: message, preferredStyle: .alert)
-        alertVC.addAction(UIAlertAction(title: "OK".localized(for: Self.self), style: .cancel, handler: nil))
-        present(alertVC, animated: true)
-    }
-
     func startNFCSession() {
         session?.invalidate()
         session = nil

Modules/RuuviDiscover/target.yml

@@ -11,6 +11,5 @@ targets:
     - target: RuuviReactor
     - target: RuuviLocal
     - target: RuuviService
-    - target: RuuviVirtual
     - target: RuuviPresenters
     - target: RuuviLocalization