Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Apply fixes from CodeFactor #1

Merged
merged 1 commit into from
May 7, 2020
+64 −64
Merged

Apply fixes from CodeFactor #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions FMobile/Utils/AppDelegate.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD

func fmobile4() {
let alert = UIAlertController(title: "new_ios_warning".localized().format([UIDevice.current.systemVersion]), message: "old_ios_description".localized(), preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "download_fmobile4".localized(), style: .cancel) { (UIAlertAction) in
alert.addAction(UIAlertAction(title: "download_fmobile4".localized(), style: .cancel) { (_) in
guard let mailto = URL(string: "https://itunes.apple.com/fr/app/fmobile-stop-national-roaming/id1449356942?l=en&mt=8") else { return }
if #available(iOS 10.0, *) {
UIApplication.shared.open(mailto)
Expand Down Expand Up @@ -496,12 +496,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
let loadingIndicator = UIActivityIndicatorView(frame: CGRect(x: 3, y: 5, width: 50, height: 50))
loadingIndicator.hidesWhenStopped = true
loadingIndicator.style = UIActivityIndicatorView.Style.gray
loadingIndicator.startAnimating();
loadingIndicator.startAnimating()
alert.view.addSubview(loadingIndicator)

self.window?.rootViewController?.present(alert, animated: true, completion: nil)

Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, error) in
Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, _) in
DispatchQueue.main.async {
print(speed ?? 0)
if speed ?? 0 < dataManager.stms {
Expand Down Expand Up @@ -588,13 +588,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
if dataManager.verifyonwifi && DataManager.isWifiConnected() && dataManager.nrDEC && dataManager.femto {
let alerteW = UIAlertController(title: "disconnect_from_wifi".localized(), message:nil, preferredStyle: UIAlertController.Style.alert)

alerteW.addAction(UIAlertAction(title: "cancel".localized(), style: .cancel) { (UIAlertAction) in
alerteW.addAction(UIAlertAction(title: "cancel".localized(), style: .cancel) { (_) in
self.timer?.invalidate()
})

self.window?.rootViewController?.present(alerteW, animated: true, completion: nil)

timer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { timer in
timer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { _ in
self.WIFIDIS()
}

Expand All @@ -605,13 +605,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
let loadingIndicator = UIActivityIndicatorView(frame: CGRect(x: 3, y: 5, width: 50, height: 50))
loadingIndicator.hidesWhenStopped = true
loadingIndicator.style = UIActivityIndicatorView.Style.gray
loadingIndicator.startAnimating();
loadingIndicator.startAnimating()

alert.view.addSubview(loadingIndicator)

self.window?.rootViewController?.present(alert, animated: true, completion: nil)

Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, error) in
Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, _) in
print("THIS SHOULD NOT BE CALLED...")
DispatchQueue.main.async {
print(speed ?? 0)
Expand Down Expand Up @@ -965,7 +965,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
if !dataManager.femtoLOWDATA && dataManager.femto && !DataManager.isWifiConnected() {

if dataManager.nrDEC {
Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, error) in
Speedtest().testDownloadSpeedWithTimout(timeout: 5.0, usingURL: dataManager.url) { (speed, _) in
DispatchQueue.main.async {
print(speed ?? 0)
if speed ?? 0 < dataManager.stms {
Expand Down Expand Up @@ -1123,7 +1123,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
error conditions that could cause the creation of the store to fail.
*/
let container = NSPersistentContainer(name: "DATA")
container.loadPersistentStores(completionHandler: { (storeDescription, error) in
container.loadPersistentStores(completionHandler: { (_, error) in
if let error = error as NSError? {
// Replace this implementation with code to handle the error appropriately.
// fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
Expand Down
2 changes: 1 addition & 1 deletion FMobile/Utils/DataManager.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class DataManager {
var disableFMobileCore = false

init() {
print(Locale.current.languageCode ?? "...");
print(Locale.current.languageCode ?? "...")
if datas.value(forKey: "modeRadin") != nil && Locale.current.languageCode == "fr" {
modeRadin = datas.value(forKey: "modeRadin") as? Bool ?? false
}
Expand Down
2 changes: 1 addition & 1 deletion FMobile/Utils/UIElementSwitch.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class UIElementSwitch: UIElement {

init(id: String, text: String, d: Bool) {
self.d = d
super.init(id: id, text: text);
super.init(id: id, text: text)
}

}
2 changes: 1 addition & 1 deletion FMobile/Views/SpeedtestProgressView.swift
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class SpeedtestProgressView: UIView {
urlst = datas.value(forKey: "URLST") as? String ?? "http://test-debit.free.fr/1048576.rnd"
}

speedtest?.testDownloadSpeedWithTimout(timeout: 15.0, usingURL: urlst) { (speed, error) in
speedtest?.testDownloadSpeedWithTimout(timeout: 15.0, usingURL: urlst) { (speed, _) in
DispatchQueue.main.async {
self.speedShape.strokeEnd = CGFloat((speed ?? 0) < self.max ? ((speed ?? 0) / self.max) : 1.0)
(self.speed.text, self.unit.text) = (speed ?? 0).toSpeedtest()
Expand Down
Loading