[feature/drag-drop-setting] Setting to disable dragging files inside …

…the app (#643) * #581 Added new setting to disable dragging files inside the app * addressed CR findings and changed the title and the default value * changed variable name for prevent dragging files and folders
owncloud · Mar 17, 2020 · 86de363 · 86de363
1 parent c5ae2ed
commit 86de363
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 6 deletions.
diff --git a/ownCloud/Client/ClientQueryViewController.swift b/ownCloud/Client/ClientQueryViewController.swift
@@ -734,6 +734,10 @@ extension ClientQueryViewController: UITableViewDragDelegate {
 
 	func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
 
+		if DisplaySettings.shared.preventDraggingFiles {
+			return [UIDragItem]()
+		}
+
 		if !self.tableView.isEditing {
 			self.populateToolbar()
 		}

diff --git a/ownCloud/Resources/en.lproj/Localizable.strings b/ownCloud/Resources/en.lproj/Localizable.strings
@@ -235,8 +235,9 @@
 "Increase Slider Value" = "Increase Slider Value";
 
 /* Display settings */
-"Display settings" = "Display settings";
+"Advanced settings" = "Advanced settings";
 "Show hidden files and folders" = "Show hidden files and folders";
+"Prevent dragging of files and folders" = "Prevent dragging of files and folders";
 
 /* Passcode Messages */
 

diff --git a/ownCloud/Settings/DisplaySettingsSection.swift b/ownCloud/Settings/DisplaySettingsSection.swift
@@ -24,12 +24,18 @@ class DisplaySettingsSection: SettingsSection {
 	override init(userDefaults: UserDefaults) {
 		super.init(userDefaults: userDefaults)
 
-		self.headerTitle = "Display settings".localized
+		self.headerTitle = "Advanced settings".localized
 
 		self.add(row: StaticTableViewRow(switchWithAction: { (row, _) in
 			if let newShowHiddenFiles = row.value as? Bool {
 				DisplaySettings.shared.showHiddenFiles = newShowHiddenFiles
 			}
 		}, title: "Show hidden files and folders".localized, value: DisplaySettings.shared.showHiddenFiles, identifier: "show-hidden-files-switch"))
+
+		self.add(row: StaticTableViewRow(switchWithAction: { (row, _) in
+			if let disableDragging = row.value as? Bool {
+				DisplaySettings.shared.preventDraggingFiles = disableDragging
+			}
+		}, title: "Prevent dragging of files and folders".localized, value: DisplaySettings.shared.preventDraggingFiles, identifier: "prevent-dragging-files-switch"))
 	}
 }
diff --git a/ownCloudAppFramework/Display Settings/DisplaySettings.h b/ownCloudAppFramework/Display Settings/DisplaySettings.h
@@ -29,17 +29,22 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Show hidden files
 @property(assign,nonatomic) BOOL showHiddenFiles;
 
+#pragma mark - Drag files
+@property(assign,nonatomic) BOOL preventDraggingFiles;
+
 #pragma mark - Query updating
 - (void)updateQueryWithDisplaySettings:(OCQuery *)query;
 
 @end
 
 extern NSString *DisplaySettingsShowHiddenFilesPrefsKey;			//!< The UserDefaults Key containing the BOOL value for .showHiddenFiles
+extern NSString *DisplaySettingsPreventDraggingFilesPrefsKey;			//!< The UserDefaults Key containing the BOOL value for .preventDraggingFiles
 
 extern OCIPCNotificationName OCIPCNotificationNameDisplaySettingsChanged; 	//!< Posted when display settings changed (internal use only)
 extern NSNotificationName DisplaySettingsChanged;				//!< Posted when display settings changed (for use by app + File Provider)
 
 extern OCClassSettingsIdentifier OCClassSettingsIdentifierDisplay; 		//!< The class settings identifier for the Display Settings
 extern OCClassSettingsKey OCClassSettingsKeyDisplayShowHiddenFiles;		//!< The class settings key for Show Hidden Files
+extern OCClassSettingsKey OCClassSettingsKeyDisplayPreventDraggingFiles;			//!< The class settings key if Drag Files is enabled
 
 NS_ASSUME_NONNULL_END
diff --git a/ownCloudAppFramework/Display Settings/DisplaySettings.m b/ownCloudAppFramework/Display Settings/DisplaySettings.m
@@ -31,7 +31,8 @@ + (OCClassSettingsIdentifier)classSettingsIdentifier
 	if ([identifier isEqual:OCClassSettingsIdentifierDisplay])
 	{
 		return (@{
-			OCClassSettingsKeyDisplayShowHiddenFiles : @(NO)
+			OCClassSettingsKeyDisplayShowHiddenFiles : @(NO),
+			OCClassSettingsKeyDisplayPreventDraggingFiles : @(NO)
 		});
 	}
 
@@ -59,6 +60,7 @@ - (instancetype)init
 		}];
 
 		_showHiddenFiles = [self _showHiddenFilesValue];
+		_preventDraggingFiles = [self _preventDraggingFilesValue];
 	}
 
 	return (self);
@@ -76,6 +78,10 @@ - (void)_handleDisplaySettingsChanged
 	_showHiddenFiles = [self _showHiddenFilesValue];
 	[self didChangeValueForKey:@"showHiddenFiles"];
 
+	[self willChangeValueForKey:@"preventDraggingFiles"];
+	_preventDraggingFiles = [self _preventDraggingFilesValue];
+	[self didChangeValueForKey:@"preventDraggingFiles"];
+
 	[[NSNotificationCenter defaultCenter] postNotificationName:DisplaySettingsChanged object:self];
 }
 
@@ -101,6 +107,28 @@ - (void)setShowHiddenFiles:(BOOL)showHiddenFiles
 	[OCIPNotificationCenter.sharedNotificationCenter postNotificationForName:OCIPCNotificationNameDisplaySettingsChanged ignoreSelf:YES];
 }
 
+#pragma mark - Drag files
+- (BOOL)_preventDraggingFilesValue
+{
+	NSNumber *preventDraggingFilesNumber;
+
+	if ((preventDraggingFilesNumber = [OCAppIdentity.sharedAppIdentity.userDefaults objectForKey:DisplaySettingsPreventDraggingFilesPrefsKey]) != nil)
+	{
+		return (preventDraggingFilesNumber.boolValue);
+	}
+
+	return ([[self classSettingForOCClassSettingsKey:OCClassSettingsKeyDisplayPreventDraggingFiles] boolValue]);
+}
+
+- (void)setPreventDraggingFiles:(BOOL)preventDraggingFiles
+{
+	_preventDraggingFiles = preventDraggingFiles;
+
+	[OCAppIdentity.sharedAppIdentity.userDefaults setBool:preventDraggingFiles forKey:DisplaySettingsPreventDraggingFilesPrefsKey];
+
+	[OCIPNotificationCenter.sharedNotificationCenter postNotificationForName:OCIPCNotificationNameDisplaySettingsChanged ignoreSelf:YES];
+}
+
 #pragma mark - Query updating
 - (void)updateQueryWithDisplaySettings:(OCQuery *)query
 {
@@ -135,10 +163,12 @@ - (BOOL)query:(OCQuery *)query shouldIncludeItem:(OCItem *)item
 @end
 
 NSString *DisplaySettingsShowHiddenFilesPrefsKey = @"display-show-hidden-files";
+NSString *DisplaySettingsPreventDraggingFilesPrefsKey = @"display-prevent-dragging-files";
 
 OCIPCNotificationName OCIPCNotificationNameDisplaySettingsChanged = @"org.owncloud.display-settings-changed";
 
 NSNotificationName DisplaySettingsChanged = @"org.owncloud.display-settings-changed";
 
 OCClassSettingsIdentifier OCClassSettingsIdentifierDisplay = @"display";
 OCClassSettingsKey OCClassSettingsKeyDisplayShowHiddenFiles = @"show-hidden-files";
+OCClassSettingsKey OCClassSettingsKeyDisplayPreventDraggingFiles = @"prevent-dragging-files";
diff --git a/ownCloudTests/SettingsTests.swift b/ownCloudTests/SettingsTests.swift
@@ -37,14 +37,15 @@ class SettingsTests: XCTestCase {
 		EarlGrey.selectElement(with: grey_accessibilityID("theme")).assert(grey_sufficientlyVisible())
 		EarlGrey.selectElement(with: grey_accessibilityID("logging")).assert(grey_sufficientlyVisible())
 	}
-	
+
 	/*
-	* PASSED if: Show hidden files and folders are displayed as part of the "Display Settings" section of Settings
+	* PASSED if: Show hidden files and folders, Drag Files are displayed as part of the "Advanced Settings" section of Settings
 	*/
 	func testCheckDisplaySettings () {
-		
+
 		//Assert
 		EarlGrey.selectElement(with: grey_accessibilityID("show-hidden-files-switch")).assert(grey_sufficientlyVisible())
+		EarlGrey.selectElement(with: grey_accessibilityID("prevent-dragging-files-switch")).assert(grey_sufficientlyVisible())
 	}
 
 	/*