Skip to content

Commit

Permalink
Merge pull request #3204 from nextcloud/3184-download-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
@i2h3
i2h3 authored Dec 20, 2024
2 parents 9f9f6ac + 341c030 commit 888a216
Show file tree
Hide file tree
Showing 19 changed files with 783 additions and 128 deletions.
2 changes: 1 addition & 1 deletion Brand/Database.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ import Foundation
// Database Realm
//
let databaseName = "nextcloud.realm"
let databaseSchemaVersion: UInt64 = 367
let databaseSchemaVersion: UInt64 = 368
50 changes: 48 additions & 2 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */; };
3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */; };
8491B1CD273BBA82001C8C5B /* UIViewController+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */; };
AA3494FE2CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3494FF2CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3495002CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3495012CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3495022CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3495032CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AA3495042CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */; };
AAAC0A122CEE34700001949E /* NCShareDownloadLimitNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAAC0A112CEE346A0001949E /* NCShareDownloadLimitNetworking.swift */; };
AAF806B22CE25E67009C2D43 /* NCShareDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF806B12CE25E60009C2D43 /* NCShareDateCell.swift */; };
AAF806B42CE25EFF009C2D43 /* NCShareToggleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF806B32CE25EFE009C2D43 /* NCShareToggleCell.swift */; };
AAF806B62CE34C7A009C2D43 /* NCShareDownloadLimitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF806B52CE34C72009C2D43 /* NCShareDownloadLimitViewController.swift */; };
AAF806B82CE37C1A009C2D43 /* NCShareDownloadLimitTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAF806B72CE37C15009C2D43 /* NCShareDownloadLimitTableViewController.swift */; };
AF1A9B6427D0CA1E00F17A9E /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */; };
AF1A9B6527D0CC0500F17A9E /* UIAlertController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */; };
AF22B206277B4E4C00DAB0CC /* NCCreateFormUploadConflict.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */; };
Expand Down Expand Up @@ -1154,6 +1166,8 @@
371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMenu.swift; sourceTree = "<group>"; };
3781B9AF23DB2B7E006B4B1D /* AppDelegate+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Menu.swift"; sourceTree = "<group>"; };
8491B1CC273BBA82001C8C5B /* UIViewController+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Menu.swift"; sourceTree = "<group>"; };
AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCManageDatabase+DownloadLimit.swift"; sourceTree = "<group>"; };
AAAC0A112CEE346A0001949E /* NCShareDownloadLimitNetworking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareDownloadLimitNetworking.swift; sourceTree = "<group>"; };
AACCAB522CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Intent.strings; sourceTree = "<group>"; };
AACCAB532CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
AACCAB542CFE041F00DA1786 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand All @@ -1163,6 +1177,11 @@
AACCAB622CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/Intent.strings; sourceTree = "<group>"; };
AACCAB632CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/Localizable.strings; sourceTree = "<group>"; };
AACCAB642CFE04F700DA1786 /* lo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lo; path = lo.lproj/InfoPlist.strings; sourceTree = "<group>"; };
AAF806B12CE25E60009C2D43 /* NCShareDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareDateCell.swift; sourceTree = "<group>"; };
AAF806B32CE25EFE009C2D43 /* NCShareToggleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareToggleCell.swift; sourceTree = "<group>"; };
AAF806B52CE34C72009C2D43 /* NCShareDownloadLimitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareDownloadLimitViewController.swift; sourceTree = "<group>"; };
AAF806B72CE37C15009C2D43 /* NCShareDownloadLimitTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareDownloadLimitTableViewController.swift; sourceTree = "<group>"; };
AAF806B92CE38BB2009C2D43 /* NextcloudKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = NextcloudKit; path = ../NextcloudKit; sourceTree = SOURCE_ROOT; };
AF1A9B6327D0CA1E00F17A9E /* UIAlertController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertController+Extension.swift"; sourceTree = "<group>"; };
AF22B20B277C6F4D00DAB0CC /* NCShareCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCell.swift; sourceTree = "<group>"; };
AF22B215277D196700DAB0CC /* NCShareExtension+DataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NCShareExtension+DataSource.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1934,6 +1953,15 @@
path = Menu;
sourceTree = "<group>";
};
AA3494FC2CE4FF02005CC075 /* DownloadLimit */ = {
isa = PBXGroup;
children = (
AAF806B52CE34C72009C2D43 /* NCShareDownloadLimitViewController.swift */,
AAF806B72CE37C15009C2D43 /* NCShareDownloadLimitTableViewController.swift */,
);
path = DownloadLimit;
sourceTree = "<group>";
};
AF8ED1FA2757821000B8DBC4 /* NextcloudUnitTests */ = {
isa = PBXGroup;
children = (
Expand All @@ -1945,11 +1973,14 @@
AF93471327E235EB002537EE /* Advanced */ = {
isa = PBXGroup;
children = (
AA3494FC2CE4FF02005CC075 /* DownloadLimit */,
AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */,
AAF806B12CE25E60009C2D43 /* NCShareDateCell.swift */,
AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */,
AAF806B32CE25EFE009C2D43 /* NCShareToggleCell.swift */,
);
path = Advanced;
sourceTree = "<group>";
Expand Down Expand Up @@ -2170,6 +2201,7 @@
F787704E22E7019900F287A9 /* NCShareLinkCell.xib */,
AF2D7C7B2742556F00ADF566 /* NCShareLinkCell.swift */,
F769454722E9F20D000A798A /* NCShareNetworking.swift */,
AAAC0A112CEE346A0001949E /* NCShareDownloadLimitNetworking.swift */,
F769453F22E9F077000A798A /* NCSharePaging.swift */,
F774264822EB4D0000B23912 /* NCSearchUserDropDownCell.xib */,
F769453B22E9CFFF000A798A /* NCShareUserCell.xib */,
Expand Down Expand Up @@ -2700,6 +2732,7 @@
F7BAAD951ED5A63D00B7EAD4 /* Data */ = {
isa = PBXGroup;
children = (
AA3494FD2CE65EA9005CC075 /* NCManageDatabase+DownloadLimit.swift */,
F7BAADB51ED5A87C00B7EAD4 /* NCManageDatabase.swift */,
AF4BF613275629E20081CEEF /* NCManageDatabase+Account.swift */,
AF4BF61D27562B3F0081CEEF /* NCManageDatabase+Activity.swift */,
Expand Down Expand Up @@ -3036,6 +3069,7 @@
F7F67B9F1A24D27800EE80DA = {
isa = PBXGroup;
children = (
AAF806B92CE38BB2009C2D43 /* NextcloudKit */,
F7B8B82F25681C3400967775 /* GoogleService-Info.plist */,
F7C1CDD91E6DFC6F005D92BE /* Brand */,
F7F67BAA1A24D27800EE80DA /* iOSClient */,
Expand Down Expand Up @@ -3869,6 +3903,7 @@
F711A4E22AF92CAE00095DD8 /* NCUtility+Date.swift in Sources */,
F7401C1B2C75E6F300649E87 /* NCCapabilities.swift in Sources */,
AF4BF61C27562A4B0081CEEF /* NCManageDatabase+Metadata.swift in Sources */,
AA3495022CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F78E2D6B29AF02DB0024D4F3 /* Database.swift in Sources */,
F7817CFF29802D1A00FFBC65 /* NCPushNotificationEncryption.m in Sources */,
F798F0EC2588060A000DAFFD /* UIColor+Extension.swift in Sources */,
Expand Down Expand Up @@ -3941,6 +3976,7 @@
F711A4E12AF92CAE00095DD8 /* NCUtility+Date.swift in Sources */,
F76882382C0DD22F001CF441 /* NCKeychain.swift in Sources */,
F7C9B9222B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */,
AA3495032CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F7490E8529882C8C009DCE94 /* NCManageDatabase+Video.swift in Sources */,
F7490E7729882C10009DCE94 /* UIColor+Extension.swift in Sources */,
F70716E62987F81500E72C1D /* DocumentActionViewController.swift in Sources */,
Expand Down Expand Up @@ -3989,6 +4025,7 @@
F73EF7DA2B0226080087E6E9 /* NCManageDatabase+Tip.swift in Sources */,
F7817CFB29801A3500FFBC65 /* Data+Extension.swift in Sources */,
F72429362AFE39860040AEF3 /* NCLivePhoto.swift in Sources */,
AA3494FF2CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
AF4BF61F27562B3F0081CEEF /* NCManageDatabase+Activity.swift in Sources */,
F7CBC1262BAC8B0000EC1D55 /* NCSectionFirstHeaderEmptyData.swift in Sources */,
F7A0D1362591FBC5008F8A13 /* String+Extension.swift in Sources */,
Expand Down Expand Up @@ -4111,6 +4148,7 @@
F783030328B4C4DD00B84583 /* ThreadSafeDictionary.swift in Sources */,
F77ED59128C9CE9D00E24ED0 /* ToolbarData.swift in Sources */,
F78302F728B4C3C900B84583 /* NCManageDatabase.swift in Sources */,
AA3495042CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F359D8682A7D03420023F405 /* NCUtility+Exif.swift in Sources */,
F7346E1628B0EF5C006CE2D2 /* Widget.swift in Sources */,
F78302F828B4C3E100B84583 /* NCManageDatabase+Activity.swift in Sources */,
Expand Down Expand Up @@ -4243,6 +4281,7 @@
F7327E392B73B8D400A462C7 /* Array+Extension.swift in Sources */,
F78E2D6929AF02DB0024D4F3 /* Database.swift in Sources */,
F749B64E297B0CBB00087535 /* NCManageDatabase+Share.swift in Sources */,
AA3494FE2CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F73EF7B32B0224350087E6E9 /* NCManageDatabase+DirectEditing.swift in Sources */,
F7401C192C75E6F300649E87 /* NCCapabilities.swift in Sources */,
F771E3F320E239A600AFB62D /* FileProviderData.swift in Sources */,
Expand Down Expand Up @@ -4355,6 +4394,7 @@
F758B460212C56A400515F55 /* NCScan.swift in Sources */,
F76882262C0DD1E7001CF441 /* NCSettingsView.swift in Sources */,
F78ACD52219046DC0088454D /* NCSectionFirstHeader.swift in Sources */,
AAF806B42CE25EFF009C2D43 /* NCShareToggleCell.swift in Sources */,
F72944F52A8424F800246839 /* NCEndToEndMetadataV1.swift in Sources */,
F710D2022405826100A6033D /* NCViewer+Menu.swift in Sources */,
F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */,
Expand Down Expand Up @@ -4394,6 +4434,7 @@
F7D4BF472CA2E8D800A5E746 /* TOSettingsKeypadImage.m in Sources */,
F7D4BF482CA2E8D800A5E746 /* TOPasscodeSettingsWarningLabel.m in Sources */,
F7D4BF492CA2E8D800A5E746 /* TOPasscodeVariableInputView.m in Sources */,
AA3495012CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F7D4BF4A2CA2E8D800A5E746 /* TOPasscodeCircleView.m in Sources */,
F7D4BF4B2CA2E8D800A5E746 /* TOPasscodeViewContentLayout.m in Sources */,
F7D4BF4C2CA2E8D800A5E746 /* TOPasscodeSettingsKeypadButton.m in Sources */,
Expand Down Expand Up @@ -4435,6 +4476,7 @@
F7EB9B132BBC12F300EDF036 /* UIApplication+Extension.swift in Sources */,
F7E98C1627E0D0FC001F9F19 /* NCManageDatabase+Video.swift in Sources */,
F7F4F11227ECDC52008676F9 /* UIFont+Extension.swift in Sources */,
AAF806B62CE34C7A009C2D43 /* NCShareDownloadLimitViewController.swift in Sources */,
F76882222C0DD1E7001CF441 /* NCCapabilitiesView.swift in Sources */,
AF93471A27E2361E002537EE /* NCShareHeader.swift in Sources */,
F7F878AE1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
Expand Down Expand Up @@ -4522,6 +4564,7 @@
F77C97392953131000FDDD09 /* NCCameraRoll.swift in Sources */,
F343A4B32A1E01FF00DDA874 /* PHAsset+Extension.swift in Sources */,
F70968A424212C4E00ED60E5 /* NCLivePhoto.swift in Sources */,
AAF806B22CE25E67009C2D43 /* NCShareDateCell.swift in Sources */,
F7C30DFA291BCF790017149B /* NCNetworkingE2EECreateFolder.swift in Sources */,
F7BC288026663F85004D46C5 /* NCViewCertificateDetails.swift in Sources */,
F78B87E92B62550800C65ADC /* NCMediaDownloadThumbnail.swift in Sources */,
Expand All @@ -4543,8 +4586,10 @@
F7D68FCC28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
F76882292C0DD1E7001CF441 /* NCManageE2EEModel.swift in Sources */,
F799DF8B2C4B84EB003410B5 /* NCCollectionViewCommon+EndToEndInitialize.swift in Sources */,
AAAC0A122CEE34700001949E /* NCShareDownloadLimitNetworking.swift in Sources */,
F78E2D6529AF02DB0024D4F3 /* Database.swift in Sources */,
F70CEF5623E9C7E50007035B /* UIColor+Extension.swift in Sources */,
AAF806B82CE37C1A009C2D43 /* NCShareDownloadLimitTableViewController.swift in Sources */,
F76882242C0DD1E7001CF441 /* NCSettingsAdvancedView.swift in Sources */,
F75CA1472962F13700B01130 /* NCHUDView.swift in Sources */,
F77BB748289985270090FC19 /* UITabBarController+Extension.swift in Sources */,
Expand Down Expand Up @@ -4586,6 +4631,7 @@
F7C9739528F17131002C43E2 /* IntentHandler.swift in Sources */,
F7A8D73D28F181D3008BBE1C /* NCUtilityFileSystem.swift in Sources */,
F73EF7E12B02266D0087E6E9 /* NCManageDatabase+Trash.swift in Sources */,
AA3495002CE65EB6005CC075 /* NCManageDatabase+DownloadLimit.swift in Sources */,
F7C9B91F2B582F550064EA91 /* NCManageDatabase+SecurityGuard.swift in Sources */,
F75DD767290ABB25002EB562 /* Intent.intentdefinition in Sources */,
F72437812C10B92500C7C68D /* NCPermissions.swift in Sources */,
Expand Down Expand Up @@ -5867,8 +5913,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/nextcloud/NextcloudKit";
requirement = {
kind = exactVersion;
version = 5.0.2;
branch = develop;
kind = branch;
};
};
F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {
Expand Down
9 changes: 9 additions & 0 deletions iOSClient/Data/NCManageDatabase+Capabilities.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ extension NCManageDatabase {
}

struct Capabilities: Codable {
let downloadLimit: DownloadLimit?
let filessharing: FilesSharing?
let theming: Theming?
let endtoendencryption: EndToEndEncryption?
Expand All @@ -102,6 +103,7 @@ extension NCManageDatabase {
let assistant: Assistant?

enum CodingKeys: String, CodingKey {
case downloadLimit = "downloadlimit"
case filessharing = "files_sharing"
case theming
case endtoendencryption = "end-to-end-encryption"
Expand All @@ -112,6 +114,11 @@ extension NCManageDatabase {
case assistant
}

struct DownloadLimit: Codable {
let enabled: Bool?
let defaultLimit: Int?
}

struct FilesSharing: Codable {
let apienabled: Bool?
let groupsharing: Bool?
Expand Down Expand Up @@ -327,6 +334,8 @@ extension NCManageDatabase {
capabilities.capabilityFileSharingInternalExpireDateDays = data.capabilities.filessharing?.ncpublic?.expiredateinternal?.days ?? 0
capabilities.capabilityFileSharingRemoteExpireDateEnforced = data.capabilities.filessharing?.ncpublic?.expiredateremote?.enforced ?? false
capabilities.capabilityFileSharingRemoteExpireDateDays = data.capabilities.filessharing?.ncpublic?.expiredateremote?.days ?? 0
capabilities.capabilityFileSharingDownloadLimit = data.capabilities.downloadLimit?.enabled ?? false
capabilities.capabilityFileSharingDownloadLimitDefaultLimit = data.capabilities.downloadLimit?.defaultLimit ?? 1

capabilities.capabilityThemingColor = data.capabilities.theming?.color ?? ""
capabilities.capabilityThemingColorElement = data.capabilities.theming?.colorelement ?? ""
Expand Down
Loading

0 comments on commit 888a216

Please sign in to comment.