Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Null check for folderFiles in findJSBundleInUpdateContents to avoid c… #2309

Closed
wants to merge 4 commits into from
Closed

Null check for folderFiles in findJSBundleInUpdateContents to avoid c… #2309

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2670a64
Null check for folderFiles in findJSBundleInUpdateContents to avoid c…
saket-bm-ai Jul 25, 2022
7c4a351
Merge branch 'master' into fix/folderFiles_null_check
MikhailSuendukov Jan 18, 2024
329cb02
Merge branch 'master' into fix/folderFiles_null_check
AnatolyPristensky Jan 24, 2024
517c3a8
Merge branch 'master' into fix/folderFiles_null_check
AnatolyPristensky Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,23 @@ public static void copyNecessaryFilesFromCurrentPackage(String diffManifestFileP
public static String findJSBundleInUpdateContents(String folderPath, String expectedFileName) {
File folder = new File(folderPath);
File[] folderFiles = folder.listFiles();
for (File file : folderFiles) {
String fullFilePath = CodePushUtils.appendPathComponent(folderPath, file.getName());
if (file.isDirectory()) {
String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath, expectedFileName);
if (mainBundlePathInSubFolder != null) {
return CodePushUtils.appendPathComponent(file.getName(), mainBundlePathInSubFolder);
}
} else {
String fileName = file.getName();
if (fileName.equals(expectedFileName)) {
return fileName;
if (folderFiles != null) {
for (File file : folderFiles) {
String fullFilePath = CodePushUtils.appendPathComponent(folderPath, file.getName());
if (file.isDirectory()) {
String mainBundlePathInSubFolder = findJSBundleInUpdateContents(fullFilePath, expectedFileName);
if (mainBundlePathInSubFolder != null) {
return CodePushUtils.appendPathComponent(file.getName(), mainBundlePathInSubFolder);
}
} else {
String fileName = file.getName();
if (fileName.equals(expectedFileName)) {
return fileName;
}
}
}
} else {
CodePushUtils.log("Couldn't find JS bundle in update contents because folderFiles came null");
}

return null;
Expand Down
Loading