Merge pull request #118 from ProteGO-Safe/release/4.5.0

Release/4.5.0

Author: qLb

.gitignore

@@ -44,6 +44,8 @@ safesafe/resources/Stage/GoogleService-Info.plist
 safesafe/resources/Dev/Config-dev.plist
 safesafe/resources/Stage/Config-stage.plist
 
+safesafe/Resources/pwa
+
 ## Xcodegen
 *.xcodeproj
 *.xcworkspace

CHANGELOG.md

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.5.0
+- Manage user diagnosis keys share rejection 
+- Prevents url requests caching
+- Added webkit local storage dump for debug panel in stage builds
+- Translations update
+- Fix for language reset on data erase
+- Added PWA to .gitignore file according to download it on CI/CD
+
 ## 4.4.0
 - Added translations for English and Ukrainian languages
 - Ability of change language in app runtime

CONTRIBUTORS.md

@@ -30,3 +30,5 @@
 | Oleksandr Katrych   | [OKatrych](https://github.com/OKatrych)                 | android        |
 | Wojciech Brydak     | [wbrydak](https://github.com/wbrydak)                   | specs          |
 | Damian Klimas       | [D4mK](https://github.com/D4mK)                         | specs, legal   |
+| Kamil Gałuszka      | [galuszkak](https://github.com/galuszkak)               | android, web   |
+| Piotr Konieczny     | [piotr-cz](https://github.com/piotr-cz)                 | web            |

Podfile.lock

@@ -206,4 +206,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 3b4c80f3b7969f193f8dc8c1f1db0378d6243a8c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

README.md

@@ -74,6 +74,14 @@ To launch it, type `sh rebuild.sh` in your console.
 
 ## ChangeLog
 
+**4.5.0**
+- Manage user diagnosis keys share rejection 
+- Prevents url requests caching
+- Added webkit local storage dump for debug panel in stage builds
+- Translations update
+- Fix for language reset on data erase
+- Added PWA to .gitignore file according to download it on CI/CD
+
 **4.4.0**
 - Added translations for English and Ukrainian languages
 - Ability of change language in app runtime

project.yml

@@ -12,7 +12,7 @@ configs:
 
 settings:
   CODE_SIGN_STYLE: Manual
-  MARKETING_VERSION: "4.4.0"
+  MARKETING_VERSION: "4.5.0"
   CURRENT_PROJECT_VERSION: 650
 
 schemes:

safesafe/Common/Error/InternalError.swift

@@ -54,4 +54,6 @@ enum InternalError: Error {
     // Uplod
     case uploadValidation
 
+    // Get diagnosis keys
+    case shareKeysUserCanceled
 }

safesafe/Components/Debug/DebugTextPreviewViewController.swift

@@ -0,0 +1,97 @@
+//
+//  DebugTextPreviewViewController.swift
+//  safesafe
+//
+//  Created by Lukasz szyszkowski on 07/10/2020.
+//
+
+import UIKit
+
+final class DebugTextPreviewViewController: UIViewController {
+    
+    private enum Constants {
+        static let closeButtonInsets = UIEdgeInsets(top: 20.0, left: 20.0, bottom: .zero, right: .zero)
+        static let closeButtonSize = CGSize(width: 22.0, height: 22.0)
+        static let titleLabelInsets = UIEdgeInsets(top: 20, left: .zero, bottom: 15.0, right: .zero)
+        static let titleFont: UIFont = .systemFont(ofSize: 18.0, weight: .bold)
+        static let textViewFont: UIFont = .systemFont(ofSize: 12)
+    }
+    
+    private let closeButton = UIButton()
+    private let titleLabel = UILabel()
+    private let textView = UITextView()
+    private let text: String
+    
+    required init?(coder: NSCoder) {
+        fatalError("has not been implemented yet")
+    }
+    
+    init(with text: String) {
+        self.text = text
+        super.init(nibName: nil, bundle: nil)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        setup()
+        layout()
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        textView.text = text
+    }
+    
+    private func setup() {
+        view.backgroundColor = .white
+        view.addSubview(textView)
+        setupCloseButton()
+        setupTitleLabel()
+        setupTextView()
+    }
+    
+    private func setupCloseButton() {
+        closeButton.translatesAutoresizingMaskIntoConstraints = false
+        closeButton.setImage(#imageLiteral(resourceName: "close_icon"), for: .normal)
+        closeButton.tintColor = .black
+        closeButton.addTarget(self, action: #selector(closeButtonTap), for: .touchUpInside)
+        view.addSubview(closeButton)
+    }
+    
+    private func setupTitleLabel() {
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        titleLabel.textColor = .black
+        titleLabel.font = Constants.titleFont
+        titleLabel.textAlignment = .center
+        titleLabel.text = DebugViewModel.Texts.previewTitle
+        view.addSubview(titleLabel)
+    }
+    
+    private func setupTextView() {
+        textView.font = Constants.textViewFont
+        view.addSubview(textView)
+    }
+    
+    private func layout() {
+        closeButton.snp.makeConstraints { maker in
+            maker.size.equalTo(Constants.closeButtonSize)
+            maker.left.top.equalToSuperview().inset(Constants.closeButtonInsets)
+        }
+        
+        titleLabel.snp.makeConstraints { maker in
+            maker.centerX.equalToSuperview()
+            maker.top.equalToSuperview().inset(Constants.titleLabelInsets)
+        }
+        
+        textView.snp.makeConstraints { maker in
+            maker.leading.trailing.bottom.equalToSuperview()
+            maker.top.equalTo(titleLabel.snp.bottom)
+        }
+    }
+    
+    @objc private func closeButtonTap(sender: UIButton) {
+        dismiss(animated: true)
+    }
+         
+}

safesafe/Components/Debug/DebugViewController.swift

@@ -81,6 +81,7 @@ final class DebugViewController: ViewController<DebugViewModel> {
     private func setupStackedItems() {
         stackButton(DebugViewModel.Texts.shareUploadedPayloadsTitle, action: .uploadedPayloadsShare)
         stackButton(DebugViewModel.Texts.shareLogsTitle, action: .logsShare)
+        stackButton(DebugViewModel.Texts.dumpLocalStorageTitl, action: .dumpLocalstorage)
     }
 
     private func stackButton(_ title: String, action: DebugAction) {
@@ -140,4 +141,21 @@ extension DebugViewController: DebugViewModelDelegate {
         let activityController = UIActivityViewController(activityItems: [fileURL], applicationActivities: nil)
         present(activityController, animated: true)
     }
+    
+    func showTextPreview(text: String) {
+        let preview = DebugTextPreviewViewController(with: text)
+        present(preview, animated: true)
+    }
+    
+    func showLocalStorageFiles(list: [String]) {
+        let alertController = UIAlertController(title: "Pick storage", message: nil, preferredStyle: .actionSheet)
+        for item in list {
+            let action = UIAlertAction(title: item, style: .default) { [weak self] _ in
+                self?.viewModel.openLocalStorage(with: item)
+            }
+            alertController.addAction(action)
+        }
+        
+        present(alertController, animated: true)
+    }
 }

safesafe/Components/Debug/DebugViewModel.swift

@@ -13,22 +13,28 @@ enum DebugAction {
     case uploadedPayloadsShare
     case uploadedPayloadsPreview
     case logsShare
+    case dumpLocalstorage
 }
 
 protocol DebugViewModelDelegate: class {
     func sharePayloads(fileURL: URL)
     func shareLogs(fileURL: URL)
+    func showTextPreview(text: String)
+    func showLocalStorageFiles(list: [String])
 }
 
 final class DebugViewModel: ViewModelType {
     weak var delegate: DebugViewModelDelegate?
+    private lazy var sqliteManager = SQLiteManager()
 
     enum Texts {
         static let title = "Debug"
+        static let previewTitle = "Preview"
         static let noUploadedPayloadsTitle = "No Uploaded Payloads Yet"
         static let shareUploadedPayloadsTitle = "Share Uploaded Payloads"
         static let noLogsTitle = "Nothing logged yet"
         static let shareLogsTitle = "Share Logs"
+        static let dumpLocalStorageTitl = "Dump Local Storage"
     }
 
     var numberOfPayloads: Int {
@@ -59,8 +65,28 @@ final class DebugViewModel: ViewModelType {
         case .logsShare:
             guard let url = try? File.logFileURL() else { return }
             delegate?.shareLogs(fileURL: url)
+        case .dumpLocalstorage:
+            let list = localStorageFiles()
+            guard !list.isEmpty else { return }
+            
+            delegate?.showLocalStorageFiles(list: list)
         default: ()
         }
     }
 
+    func openLocalStorage(with name: String) {
+        delegate?.showTextPreview(text: sqliteManager.read(fileName: name))
+    }
+    
+    private func localStorageFiles() -> [String] {
+        do {
+            let dirURL = try Directory.webkitLocalStorage()
+            let dirContent = try FileManager.default.contentsOfDirectory(atPath: dirURL.path).filter({ $0.hasSuffix("localstorage")})
+            
+            return dirContent
+            
+        } catch { console(error, type: .error) }
+        
+        return []
+    }
 }