Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java

Issue 2973103003: [Android] Remove unnecessary null check in WebappDirectoryManager#findStaleWebappDirectories() (Closed)
Patch Set: Merge branch 'webapp_directory_manager' into webapp_directory_manager1_5 Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java
index a811afa4918e42d2b33e6f504c6c7b9f95db5b45..5d7631d768e53ba848ad7f6351e4fcf923aa3072 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDirectoryManager.java
@@ -111,28 +111,24 @@ public class WebappDirectoryManager {
}
}
- if (webappBaseDirectory != null) {
- // Delete all web app directories in the main directory, which were for pre-L web apps.
- File appDirectory = new File(context.getApplicationInfo().dataDir);
- String webappDirectoryAppBaseName = webappBaseDirectory.getName();
- File[] files = appDirectory.listFiles();
- if (files != null) {
- for (File file : files) {
- String filename = file.getName();
- if (!filename.startsWith(webappDirectoryAppBaseName)) continue;
- if (filename.length() == webappDirectoryAppBaseName.length()) continue;
- directoriesToDelete.add(file);
- }
+ // Delete all web app directories in the main directory, which were for pre-L web apps.
+ File appDirectory = new File(context.getApplicationInfo().dataDir);
+ String webappDirectoryAppBaseName = webappBaseDirectory.getName();
+ File[] files = appDirectory.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ String filename = file.getName();
+ if (!filename.startsWith(webappDirectoryAppBaseName)) continue;
+ if (filename.length() == webappDirectoryAppBaseName.length()) continue;
+ directoriesToDelete.add(file);
}
+ }
- // Clean out web app directories no longer corresponding to tasks in Recents.
- if (webappBaseDirectory.exists()) {
- files = webappBaseDirectory.listFiles();
- if (files != null) {
- for (File file : files) {
- if (!liveWebapps.contains(file.getName())) directoriesToDelete.add(file);
- }
- }
+ // Clean out web app directories no longer corresponding to tasks in Recents.
+ files = webappBaseDirectory.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ if (!liveWebapps.contains(file.getName())) directoriesToDelete.add(file);
}
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698