Merge lp:~karni/ubuntuone-android-files/safe-delete-real-deal into lp:ubuntuone-android-files

[Michał Karnicki]

Fixed not deleting local file when performing delete.

Properly delete locally cached files when delete is performed by the user.
Do not delete non empty directories.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'src/com/ubuntuone/android/files/activity/FilesActivity.java'
--- src/com/ubuntuone/android/files/activity/FilesActivity.java	2013-02-05 16:02:57 +0000
+++ src/com/ubuntuone/android/files/activity/FilesActivity.java	2013-02-06 23:11:24 +0000
@@ -1268,7 +1268,7 @@
 	private void onFileDeleteFromDeviceClicked(final FileViewHolder holder) {
 		String path = FileUtilities.getFilePathFromResourcePath(
 				holder.resourcePath);
-		FileUtilities.removeSilently(path);
+		FileUtilities.safeDeleteSilently(path);
 		MetaUtilities.setStateAndData(holder.resourcePath, null, null);
 		MetaUtilities.notifyChange(Nodes.CONTENT_URI);
 	}

=== modified file 'src/com/ubuntuone/android/files/provider/MetaUtilities.java'
--- src/com/ubuntuone/android/files/provider/MetaUtilities.java	2012-09-26 00:22:58 +0000
+++ src/com/ubuntuone/android/files/provider/MetaUtilities.java	2013-02-06 23:11:24 +0000
@@ -558,53 +558,68 @@
 		return false;
 	}
 	
-	public static void deleteByResourcePath(String resourcePath) {
-		String where = Nodes.NODE_RESOURCE_PATH + "=?";
-		String[] selectionArgs = new String[] { resourcePath };
-		sResolver.delete(Nodes.CONTENT_URI, where, selectionArgs);
-	}
-	
-	public static void cleanupTreeByResourcePath(String resourcePath) {
-		Log.i(TAG, "cleaning up tree of: " + resourcePath);
+	public static void delete(String resourcePath) {
+		Log.d(TAG, "Delete " + resourcePath);
 		String kindString = MetaUtilities.getStringField(
 				resourcePath, Nodes.NODE_KIND);
-		if (kindString == null) {
+		if (kindString == null) { // Consistency check.
+			Log.e(TAG, "Node has null kind!");
 			return;
 		}
-		
 		U1NodeKind kind = U1NodeKind.valueOf(kindString.toUpperCase(Locale.US));
+		
 		if (kind == U1NodeKind.FILE) {
-			String data = FileUtilities.getFilePathFromResourcePath(resourcePath);
-			FileUtilities.removeSilently(data);
-			MetaUtilities.deleteByResourcePath(resourcePath);
+			deleteFile(resourcePath);
 		} else {
-			String resourcePathFmt = resourcePath + "/%";
-			String[] projection = new String[] {
-					Nodes.NODE_RESOURCE_PATH, Nodes.NODE_DATA
-			};
-			String selection = Nodes.NODE_RESOURCE_PATH + " LIKE ?";
-			String[] selectionArgs = new String[] { resourcePathFmt };
-			
-			Cursor c = sResolver.query(Nodes.CONTENT_URI, projection,
+			deleteDirectory(resourcePath);
+		}
+	}
+	
+	public static void deleteFile(String fileResPath) {
+		deleteFileContent(fileResPath);
+		deleteNodeMetadata(fileResPath);
+	}
+	
+	private static void deleteFileContent(String fileResPath) {
+		String path = FileUtilities.getFilePathFromResourcePath(fileResPath);
+		FileUtilities.safeDeleteSilently(path);
+	}
+	
+	public static void deleteDirectory(String dirResPath) {
+		deleteDirectoryContent(dirResPath);
+		deleteNodeMetadata(dirResPath);
+	}
+	
+	private static void deleteDirectoryContent(String dirResPath) {
+		String resPathFmt = dirResPath + "/%";
+		String[] projection =
+				new String[] { Nodes.NODE_RESOURCE_PATH, Nodes.NODE_DATA };
+		String selection = Nodes.NODE_RESOURCE_PATH + " LIKE ?";
+		String[] selectionArgs = new String[] { resPathFmt };
+		
+		Cursor c = null;
+		try {
+			c = sResolver.query(Nodes.CONTENT_URI, projection,
 					selection, selectionArgs, null);
-			if (c != null) {
-				try {
-					while (c.moveToNext()) {
-						String data = FileUtilities.getFilePathFromResourcePath(
-								resourcePathFmt);
-						FileUtilities.removeSilently(data);
-					}
-				} finally {
-					c.close();
-				}
+			if (c != null && c.moveToFirst()) {
+				do {
+					String resPath = c.getString(c.getColumnIndex(
+							Nodes.NODE_RESOURCE_PATH));
+					delete(resPath);
+				} while (c.moveToNext());
 			}
-			
-			sResolver.delete(Nodes.CONTENT_URI, selection, selectionArgs);
-			
-			selection = Nodes.NODE_RESOURCE_PATH + "=?";
-			selectionArgs = new String[] { resourcePath };
-			sResolver.delete(Nodes.CONTENT_URI, selection, selectionArgs);
+		} finally {
+			if (c != null) c.close();
 		}
+		
+		String path = FileUtilities.getFilePathFromResourcePath(dirResPath);
+		FileUtilities.safeDeleteSilently(path);
+	}
+	
+	public static void deleteNodeMetadata(String resourcePath) {
+		String where = Nodes.NODE_RESOURCE_PATH + "=?";
+		String[] selectionArgs = new String[] { resourcePath };
+		sResolver.delete(Nodes.CONTENT_URI, where, selectionArgs);
 	}
 	
 	public static Uri buildNodeUri(int id) {
@@ -764,10 +779,10 @@
 			}
 		} else {
 			if (node.getKind() == U1NodeKind.FILE) {
-				FileUtilities.removeSilently(FileUtilities
+				FileUtilities.safeDeleteSilently(FileUtilities
 						.getFilePathFromResourcePath(resourcePath));
 			}
-			MetaUtilities.deleteByResourcePath(resourcePath);
+			MetaUtilities.deleteNodeMetadata(resourcePath);
 		}
 		MetaUtilities.notifyChange(Nodes.CONTENT_URI);
 	}

=== modified file 'src/com/ubuntuone/android/files/service/MetaService.java'
--- src/com/ubuntuone/android/files/service/MetaService.java	2013-02-02 12:48:16 +0000
+++ src/com/ubuntuone/android/files/service/MetaService.java	2013-02-06 23:11:24 +0000
@@ -299,7 +299,7 @@
 				if (NetworkUtil.isConnected(MetaService.this)) {
 					// We are connected, thus left cachedNodePaths are invalid.
 					for (String oldNodePath : cachedNodePaths) {
-						MetaUtilities.cleanupTreeByResourcePath(oldNodePath);
+						MetaUtilities.delete(oldNodePath);
 					}
 				}
 				contentResolver.notifyChange(Nodes.CONTENT_URI, null);
@@ -445,7 +445,7 @@
 			if (!oldHash.equals(newHash)) {
 				String path = FileUtilities.getFilePathFromResourcePath(
 						node.getResourcePath());
-				FileUtilities.removeSilently(path);
+				FileUtilities.safeDeleteSilently(path);
 				data = "";
 			}
 		}
@@ -660,14 +660,15 @@
 		api.deleteNode(resourcePath, new U1NodeListener() {
 			@Override
 			public void onStart() {
-				receiver.send(Status.RUNNING, data);
+				if (receiver != null)
+					receiver.send(Status.RUNNING, data);
 				MetaUtilities.setState(resourcePath, ResourceState.STATE_DELETING);
 				MetaUtilities.notifyChange(Nodes.CONTENT_URI);
 			}
 
 			@Override
 			public void onSuccess(U1Node node) {
-				MetaUtilities.deleteByResourcePath(resourcePath);
+				MetaUtilities.delete(resourcePath);
 			}
 			
 			@Override
@@ -682,7 +683,6 @@
 
 			@Override
 			public void onFinish() {
-				MetaUtilities.deleteByResourcePath(resourcePath);
 				MetaUtilities.notifyChange(Nodes.CONTENT_URI);
 				if (receiver != null)
 					receiver.send(Status.FINISHED, data);
@@ -760,7 +760,7 @@
 							values.put(Nodes.NODE_DATA, "");
 							
 							String data = c.getString(c.getColumnIndex(Nodes.NODE_DATA));
-							FileUtilities.removeSilently(data);
+							FileUtilities.safeDeleteSilently(data);
 							
 							Uri uri = MetaUtilities.buildNodeUri(id);
 							ContentProviderOperation op = ContentProviderOperation

=== modified file 'src/com/ubuntuone/android/files/util/FileUtilities.java'
--- src/com/ubuntuone/android/files/util/FileUtilities.java	2012-08-06 20:03:41 +0000
+++ src/com/ubuntuone/android/files/util/FileUtilities.java	2013-02-06 23:11:24 +0000
@@ -191,7 +191,7 @@
 		return result;
 	}
 	
-	public static void removeSilently(String path) {
+	public static void safeDeleteSilently(String path) {
 		try {
 			if (!TextUtils.isEmpty(path)) {
 				// Legacy check.
@@ -200,17 +200,12 @@
 				}
 				
 				File file = new File(path);
-				if (file.exists()) {
-					if (file.isDirectory()) {
-						File[] children = file.listFiles();
-						if (children != null) {
-							for (File child : children) {
-								removeSilently(child.getAbsolutePath());
-							}
-						}
-					} else {
-						file.delete();
-					}
+				if (!file.exists()) return;
+				
+				if (file.isDirectory() && isDirectoryEmpty(file)) {
+					file.delete();
+				} else if (file.isFile()) {
+					file.delete();
 				}
 			}
 		} catch (Exception e) {
@@ -218,6 +213,17 @@
 		}
 	}
 	
+	private static boolean isDirectoryEmpty(File dir) {
+		File[] children = dir.listFiles();
+		if (children == null) {
+			return true;
+		}
+		if (children.length == 0) {
+			return true;
+		}
+		return false;
+	}
+	
 	public static String sanitize(String filename) {
 		return filename.replace(":", "_");
 	}