Hotfix of zero speed limit

XITRIX · Mar 19, 2020 · 349e41a · 349e41a
1 parent 398e6da
commit 349e41a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/iTorrent.xcodeproj/project.pbxproj b/iTorrent.xcodeproj/project.pbxproj
@@ -857,7 +857,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 15.0;
+				CURRENT_PROJECT_VERSION = 16.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = D5UQ7XT49T;
 				ENABLE_BITCODE = NO;
@@ -885,7 +885,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.4.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -914,7 +914,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 15.0;
+				CURRENT_PROJECT_VERSION = 16.0;
 				DEVELOPMENT_TEAM = D5UQ7XT49T;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -941,7 +941,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.4.1;
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.nonamedude.iTorrent;

diff --git a/iTorrent/System/BackgroundTask.swift b/iTorrent/System/BackgroundTask.swift
@@ -65,6 +65,7 @@ class BackgroundTask {
     }
 
     static func getBackgroundConditions(_ status: TorrentStatus) -> Bool {
+        // state conditions
         (status.displayState == Utils.TorrentStates.downloading.rawValue ||
             status.displayState == Utils.TorrentStates.metadata.rawValue ||
             status.displayState == Utils.TorrentStates.hashing.rawValue ||
@@ -73,7 +74,9 @@ class BackgroundTask {
                 status.seedMode) ||
             (UserPreferences.ftpKey.value &&
                 UserPreferences.ftpBackgroundKey.value)) &&
-            (UserPreferences.zeroSpeedLimit.value > 0 &&
-                Manager.managerSaves[status.hash]?.zeroSpeedTimeCounter ?? 0 < UserPreferences.zeroSpeedLimit.value)
+            // zero speed limit conditions
+            ((UserPreferences.zeroSpeedLimit.value > 0 &&
+                    Manager.managerSaves[status.hash]?.zeroSpeedTimeCounter ?? 0 < UserPreferences.zeroSpeedLimit.value) ||
+                UserPreferences.zeroSpeedLimit.value == 0)
     }
 }
diff --git a/iTorrent/Utils/TorrentStatus.swift b/iTorrent/Utils/TorrentStatus.swift
@@ -129,7 +129,7 @@ class TorrentStatus {
         }
 
         if manager.zeroSpeedTimeCounter == UserPreferences.zeroSpeedLimit.value,
-            manager.zeroSpeedTimeCounter != 0 {
+            UserPreferences.zeroSpeedLimit.value != 0 {
             NotificationHelper.showNotification(
                 title: Localize.get("BackgroundTask.LowSpeed.Title") + "(\(Utils.getSizeText(size: Int64(downloadRate)))/s)",
                 body: title + Localize.get("BackgroundTask.LowSpeed.Message"),

diff --git a/iTorrent/Version.ver b/iTorrent/Version.ver
@@ -1 +1 @@
-1.7.4
+1.7.4(Hotfix)
diff --git a/iTorrent/ViewControllers/TorrentFilesController.swift b/iTorrent/ViewControllers/TorrentFilesController.swift
@@ -278,7 +278,7 @@ class TorrentFilesController: ThemedUIViewController {
             tableViewEditMode = false
 
             navigationItem.setLeftBarButton(nil, animated: true)
-            navigationItem.rightBarButtonItem?.title = NSLocalizedString("Select", comment: "")
+            navigationItem.rightBarButtonItem?.title = Localize.get("TorrentFilesController.Select")
             navigationItem.rightBarButtonItem?.style = .plain
 
             setToolbarItems(defaultToolBarItems, animated: true)

diff --git a/iTorrent/en.lproj/Localizable.strings b/iTorrent/en.lproj/Localizable.strings
@@ -204,4 +204,4 @@
 
 //Version Info
 "info" = " Update info";
-"UpdateText" = "- Added https protocol support for trackers!\n- FTP server replaced by WebDAV, file sharing is now possible through a web browser\n- Added background stop when downloading at zero speed\n- Clicking on a notification now opens a specific window\n- UI improvements";
+"UpdateText" = "- Zero speed limit disable state fixed\n----- 1.7.4 -----\n- Added https protocol support for trackers!\n- FTP server replaced by WebDAV, file sharing is now possible through a web browser\n- Added background stop when downloading at zero speed\n- Clicking on a notification now opens a specific window\n- UI improvements";
diff --git a/iTorrent/ru.lproj/Localizable.strings b/iTorrent/ru.lproj/Localizable.strings
@@ -212,4 +212,4 @@
 
 //Version Info
 "info" = " Изменения";
-"UpdateText" = "- Добавлена поддержка протокола https для трекеров!\n- FTP сервер был заменён на WebDAV, теперь обмен файлами возможен через браузер\n- Добавлена остановка фонового режима при скачивании с нулевой скоростью\n- Нажатие на оповещение теперь открывает конкретное окно\n- Улучшения в интерфейсе";
+"UpdateText" = "- Исправлено отключение лимита нулевой скорости\n----- 1.7.4 -----\n- Добавлена поддержка протокола https для трекеров!\n- FTP сервер был заменён на WebDAV, теперь обмен файлами возможен через браузер\n- Добавлена остановка фонового режима при скачивании с нулевой скоростью\n- Нажатие на оповещение теперь открывает конкретное окно\n- Улучшения в интерфейсе";