Skip to content

Commit 7162854

Browse files
qLbqLb
authored
Merge pull request #116 from ProteGO-Safe/release/4.4.0
Release/4.4.0
2 parents c1289ce + f6cef6d commit 7162854

39 files changed

+2890
-304
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
66
The format is based on [Keep a Changelog](http://keepachangelog.com/)
77
and this project adheres to [Semantic Versioning](http://semver.org/).
88

9+
## 4.4.0
10+
- Added translations for English and Ukrainian languages
11+
- Ability of change language in app runtime
12+
- Fix for multiple language managing
13+
- Fix for "no internet" alert on keys upload
14+
- Fix for disclaimer and contrib file
15+
- Remove redundant data logging
16+
917
## 4.3.1
1018
- Fix for incorrect date display for entries in Health Journal in PWA
1119

‎CONTRIBUTORS.md‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
## Lista osób które podpisały [oświadczenie o udzieleniu licencji](CONTRIBUTING.md#Oświadczenie-o-udzieleniu-licencji) i wprowadziły zmiany w projekcie:
2-
3-
Imię i nazwisko | GitHub ID | Komponenty
4-
---------------------- | ----------------------------------------------------------| -----------------------------
5-
Jakub Lipiński | [jakublipinski](https://github.com/jakublipinski) | backend, specs
6-
Adam Dobrawy | [ad-m](https://github.com/ad-m) | specs
7-
Piotr Kalinowski | [optimusbits](https://github.com/optimusbits) | ios
8-
Oskar Hinc | [oskarhinc](https://github.com/oskarhinc) | specs
9-
Maciej Janusz | [maciekjanusz](https://github.com/maciekjanusz) | android
10-
Tobiasz Olejnik | [tobiaszolejnik](https://github.com/tobiaszolejnik) | android
11-
Błażej Biesiada | [bejo](https://github.com/bejo) | ios
12-
Mikołaj Lewandowski | [mikolevy](https://github.com/mikolevy) | specs
13-
Bartosz Paszcza | [bpaszcza](https://github.com/bpaszcza) | specs
14-
Wojciech Dziwulski | [wojdziw](https://github.com/wojdziw) | specs
15-
Wojciech Szkutnik | [wojtekszkutnik](https://github.com/wojtekszkutnik) | specs
16-
Michał Kuchtar | [michalkuchtar](https://github.com/michalkuchtar) | android
17-
Tomasz Heimowski | [theimowski](https://github.com/theimowski) | android
18-
Adam Kozłowski | [vetin4ri](https://github.com/vetin4ri) | backend
19-
Jarosław Smiejczak | [jotes](https://github.com/jotes) | backend
20-
Paweł Kleczkowski | [pkleczko](https://github.com/pkleczko) | android
21-
Kamil Pawlak | [qLb](https://github.com/qLb) | specs,backend
22-
Artur Słomowski | [tarvald](https://github.com/tarvald) | specs,backend
23-
Łukasz Dąbrzalski | [lukaszdabrzalski](https://github.com/lukaszdabrzalski) | web
24-
Rafał Małczyński | [RMalczynski](https://github.com/RMalczynski) | ios
25-
Łukasz Szyszkowski | [lukasz-szyszkowski](https://github.com/RMalczynski) | ios
26-
Wojciech Nasiłowski | [wnasilowski](https://github.com/wnasilowski) | android
27-
Tomasz Molenda | [TomaszMolenda](https://github.com/TomaszMolenda) | web
28-
Jakub Rękas | [jakubrekas1](https://github.com/jakubrekas1) | web
29-
Mateusz Andruszko | [mateuszandruszko](https://github.com/mateuszandruszko) | web
30-
Michał Poteralski | [MikeSPtr](https://github.com/MikeSPtr) | android
31-
Oleksandr Katrych | [OKatrych](https://github.com/OKatrych) | android
32-
Wojciech Brydak | [wbrydak](https://github.com/wbrydak) | specs
1+
## Lista osób które podpisały [oświadczenie o udzieleniu licencji](DISCLAIMER.pdf) i wprowadziły zmiany w projekcie:
2+
| Imię i nazwisko | GitHub ID | Komponenty |
3+
| ------------------- | ------------------------------------------------------- | -------------- |
4+
| Jakub Lipiński | [jakublipinski](https://github.com/jakublipinski) | backend, specs |
5+
| Adam Dobrawy | [ad-m](https://github.com/ad-m) | specs |
6+
| Piotr Kalinowski | [optimusbits](https://github.com/optimusbits) | ios |
7+
| Oskar Hinc | [oskarhinc](https://github.com/oskarhinc) | specs |
8+
| Maciej Janusz | [maciekjanusz](https://github.com/maciekjanusz) | android |
9+
| Tobiasz Olejnik | [tobiaszolejnik](https://github.com/tobiaszolejnik) | android |
10+
| Błażej Biesiada | [bejo](https://github.com/bejo) | ios |
11+
| Mikołaj Lewandowski | [mikolevy](https://github.com/mikolevy) | specs |
12+
| Bartosz Paszcza | [bpaszcza](https://github.com/bpaszcza) | specs |
13+
| Wojciech Dziwulski | [wojdziw](https://github.com/wojdziw) | specs |
14+
| Wojciech Szkutnik | [wojtekszkutnik](https://github.com/wojtekszkutnik) | specs |
15+
| Michał Kuchtar | [michalkuchtar](https://github.com/michalkuchtar) | android |
16+
| Tomasz Heimowski | [theimowski](https://github.com/theimowski) | android |
17+
| Adam Kozłowski | [vetin4ri](https://github.com/vetin4ri) | backend |
18+
| Jarosław Smiejczak | [jotes](https://github.com/jotes) | backend |
19+
| Paweł Kleczkowski | [pkleczko](https://github.com/pkleczko) | android |
20+
| Kamil Pawlak | [qLb](https://github.com/qLb) | specs,backend |
21+
| Artur Słomowski | [tarvald](https://github.com/tarvald) | specs,backend |
22+
| Łukasz Dąbrzalski | [lukaszdabrzalski](https://github.com/lukaszdabrzalski) | web |
23+
| Rafał Małczyński | [RMalczynski](https://github.com/RMalczynski) | ios |
24+
| Łukasz Szyszkowski | [lukasz-szyszkowski](https://github.com/RMalczynski) | ios |
25+
| Wojciech Nasiłowski | [wnasilowski](https://github.com/wnasilowski) | android |
26+
| Tomasz Molenda | [TomaszMolenda](https://github.com/TomaszMolenda) | web |
27+
| Jakub Rękas | [jakubrekas1](https://github.com/jakubrekas1) | web |
28+
| Mateusz Andruszko | [mateuszandruszko](https://github.com/mateuszandruszko) | web |
29+
| Michał Poteralski | [MikeSPtr](https://github.com/MikeSPtr) | android |
30+
| Oleksandr Katrych | [OKatrych](https://github.com/OKatrych) | android |
31+
| Wojciech Brydak | [wbrydak](https://github.com/wbrydak) | specs |
32+
| Damian Klimas | [D4mK](https://github.com/D4mK) | specs, legal |

‎DISCLAIMER.pdf‎

640 Bytes
Binary file not shown.

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ To launch it, type `sh rebuild.sh` in your console.
7474

7575
## ChangeLog
7676

77+
**4.4.0**
78+
- Added translations for English and Ukrainian languages
79+
- Ability of change language in app runtime
80+
- Fix for multiple language managing
81+
- Fix for "no internet" alert on keys upload
82+
- Fix for disclaimer and contrib file
83+
- Remove redundant data logging
84+
7785
**4.3.1**
7886
- Fix for incorrect date display for entries in Health Journal in PWA
7987

‎project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ configs:
1212

1313
settings:
1414
CODE_SIGN_STYLE: Manual
15-
MARKETING_VERSION: "4.3.1"
16-
CURRENT_PROJECT_VERSION: 470
15+
MARKETING_VERSION: "4.4.0"
16+
CURRENT_PROJECT_VERSION: 650
1717

1818
schemes:
1919
safesafe Dev:

‎safesafe/App/AppDelegate.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
6161
for i in 0..<deviceToken.count {
6262
token = token + String(format: "%02.2hhx", arguments: [deviceToken[i]])
6363
}
64-
console(token)
6564
NotificationManager.shared.update(token: deviceToken)
6665
}
6766

‎safesafe/Common/Extensions/String/String+localized.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extension String {
1919
let bundle = Bundle(path: path)
2020
else { return "\(Constants.bundleNotFoundPrefix)\(languageCode)_\(self)" }
2121

22-
let localized = NSLocalizedString(self, tableName: languageCode, bundle: bundle, value: .empty, comment: comment)
22+
let localized = NSLocalizedString(self, tableName: languageCode.lowercased(), bundle: bundle, value: .empty, comment: comment)
2323
if localized == self {
2424
return NSLocalizedString(self, tableName: LanguageController.default, bundle: bundle, value: .empty, comment: comment)
2525
}

‎safesafe/Common/Helpers/WebCacheCleaner.swift‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import PromiseKit
1111

1212
final class WebCacheCleaner {
1313

14+
@discardableResult
1415
class func clean() -> Promise<Void> {
1516
return Promise { seal in
1617
let dispatchGroup = DispatchGroup()
@@ -29,4 +30,14 @@ final class WebCacheCleaner {
2930
}
3031
}
3132

33+
class func removeLocalStorage() {
34+
do {
35+
let dir = try Directory.webkitLocalStorage()
36+
let content = try FileManager.default.contentsOfDirectory(atPath: dir.path)
37+
for path in content {
38+
let fullPath = dir.appendingPathComponent(path)
39+
try FileManager.default.removeItem(at: fullPath)
40+
}
41+
} catch { console(error) }
42+
}
3243
}

‎safesafe/Language/LanguageController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ enum LanguageController {
1818
}
1919

2020
static let `default` = Constants.defaultLanguage
21-
static let selected: String = StoredDefaults.standard.get(key: .selectedLanguage) ?? systemLanguage
21+
static var selected: String { StoredDefaults.standard.get(key: .selectedLanguage) ?? systemLanguage }
2222

2323
static let systemLanguage = Locale.current.languageCode ?? Constants.defaultLanguage
2424

‎safesafe/Resources/pwa/asset-manifest.json‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"files": {
3-
"main.css": "./static/css/main.415b96f3.chunk.css",
4-
"main.js": "./static/js/main.48380ef2.chunk.js",
5-
"main.js.map": "./static/js/main.48380ef2.chunk.js.map",
3+
"main.css": "./static/css/main.d900b721.chunk.css",
4+
"main.js": "./static/js/main.3bb33d24.chunk.js",
5+
"main.js.map": "./static/js/main.3bb33d24.chunk.js.map",
66
"runtime-main.js": "./static/js/runtime-main.fb776cef.js",
77
"runtime-main.js.map": "./static/js/runtime-main.fb776cef.js.map",
8-
"static/css/2.4056c84d.chunk.css": "./static/css/2.4056c84d.chunk.css",
9-
"static/js/2.38b46f86.chunk.js": "./static/js/2.38b46f86.chunk.js",
10-
"static/js/2.38b46f86.chunk.js.map": "./static/js/2.38b46f86.chunk.js.map",
8+
"static/css/2.be51859f.chunk.css": "./static/css/2.be51859f.chunk.css",
9+
"static/js/2.d14f1330.chunk.js": "./static/js/2.d14f1330.chunk.js",
10+
"static/js/2.d14f1330.chunk.js.map": "./static/js/2.d14f1330.chunk.js.map",
1111
"index.html": "./index.html",
12-
"precache-manifest.ac707751868ec1582dca9b995166deac.js": "./precache-manifest.ac707751868ec1582dca9b995166deac.js",
12+
"precache-manifest.aaa327aec9a68088071a527e036768f3.js": "./precache-manifest.aaa327aec9a68088071a527e036768f3.js",
1313
"service-worker.js": "./service-worker.js",
14-
"static/css/2.4056c84d.chunk.css.map": "./static/css/2.4056c84d.chunk.css.map",
15-
"static/css/main.415b96f3.chunk.css.map": "./static/css/main.415b96f3.chunk.css.map",
16-
"static/js/2.38b46f86.chunk.js.LICENSE.txt": "./static/js/2.38b46f86.chunk.js.LICENSE.txt",
14+
"static/css/2.be51859f.chunk.css.map": "./static/css/2.be51859f.chunk.css.map",
15+
"static/css/main.d900b721.chunk.css.map": "./static/css/main.d900b721.chunk.css.map",
16+
"static/js/2.d14f1330.chunk.js.LICENSE.txt": "./static/js/2.d14f1330.chunk.js.LICENSE.txt",
1717
"static/media/Logo-govpl-WHITE.svg": "./static/media/Logo-govpl-WHITE.83177134.svg",
1818
"static/media/Logo-govpl.svg": "./static/media/Logo-govpl.65d43f08.svg",
1919
"static/media/index.css": "./static/media/OpenSans-Regular.6fde2eb6.woff",
@@ -73,7 +73,7 @@
7373
"static/media/ci.svg": "./static/media/ci.02796bef.svg",
7474
"static/media/ck.svg": "./static/media/ck.0e4eaabf.svg",
7575
"static/media/cl.svg": "./static/media/cl.dfefa273.svg",
76-
"static/media/close.svg": "./static/media/close.5ae5eba9.svg",
76+
"static/media/close-modal.2b7529e8.svg": "./static/media/close-modal.2b7529e8.svg",
7777
"static/media/cm.svg": "./static/media/cm.4982702b.svg",
7878
"static/media/cn.svg": "./static/media/cn.ce4c8db3.svg",
7979
"static/media/co.svg": "./static/media/co.714d1724.svg",
@@ -95,6 +95,7 @@
9595
"static/media/ec.svg": "./static/media/ec.ca34fc75.svg",
9696
"static/media/ee.svg": "./static/media/ee.10148440.svg",
9797
"static/media/eg.svg": "./static/media/eg.e1ba2666.svg",
98+
"static/media/en.svg": "./static/media/en.4df1e7ea.svg",
9899
"static/media/er.svg": "./static/media/er.ed8466e0.svg",
99100
"static/media/error.svg": "./static/media/error.475281bd.svg",
100101
"static/media/es.svg": "./static/media/es.e6a28e06.svg",
@@ -133,6 +134,7 @@
133134
"static/media/il.svg": "./static/media/il.8cfa7ba1.svg",
134135
"static/media/im.svg": "./static/media/im.3e276e7d.svg",
135136
"static/media/in.svg": "./static/media/in.7fdfdb85.svg",
137+
"static/media/info-tooltip.svg": "./static/media/info-tooltip.67b513ac.svg",
136138
"static/media/info.svg": "./static/media/info.f16215e1.svg",
137139
"static/media/io.svg": "./static/media/io.aecf8a97.svg",
138140
"static/media/iq.svg": "./static/media/iq.a1520bca.svg",
@@ -155,6 +157,7 @@
155157
"static/media/ky.svg": "./static/media/ky.b7acd796.svg",
156158
"static/media/kz.svg": "./static/media/kz.130a3907.svg",
157159
"static/media/la.svg": "./static/media/la.3d622932.svg",
160+
"static/media/language.svg": "./static/media/language.e9ae2c18.svg",
158161
"static/media/lb.svg": "./static/media/lb.5e6ca722.svg",
159162
"static/media/li.svg": "./static/media/li.64c4108b.svg",
160163
"static/media/lk.svg": "./static/media/lk.d5cf9401.svg",
@@ -295,9 +298,9 @@
295298
},
296299
"entrypoints": [
297300
"static/js/runtime-main.fb776cef.js",
298-
"static/css/2.4056c84d.chunk.css",
299-
"static/js/2.38b46f86.chunk.js",
300-
"static/css/main.415b96f3.chunk.css",
301-
"static/js/main.48380ef2.chunk.js"
301+
"static/css/2.be51859f.chunk.css",
302+
"static/js/2.d14f1330.chunk.js",
303+
"static/css/main.d900b721.chunk.css",
304+
"static/js/main.3bb33d24.chunk.js"
302305
]
303306
}

0 commit comments

Comments
 (0)