Skip to content

Commit

Permalink
Merge pull request #771 from NativeScript/pete/clear-assets-on-update
Browse files Browse the repository at this point in the history 
Fix asset extraction
  • Loading branch information
@petekanev
petekanev authored May 31, 2017
2 parents 3d50b50 + f4efc8b commit f7a8222
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 15 deletions.
12 changes: 7 additions & 5 deletions build-artifacts/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ public static Runtime initRuntime(Application app) {

String outputDir = app.getFilesDir().getPath() + File.separator;

aE.extractAssets(app, "app", outputDir, extractPolicy);
aE.extractAssets(app, "internal", outputDir, extractPolicy);
aE.extractAssets(app, "metadata", outputDir, extractPolicy);
// will force deletion of previously extracted files in app/files directories
// see https://github.com/NativeScript/NativeScript/issues/4137 for reference
boolean removePreviouslyInstalledAssets = true;
aE.extractAssets(app, "app", outputDir, extractPolicy, removePreviouslyInstalledAssets);
aE.extractAssets(app, "internal", outputDir, extractPolicy, removePreviouslyInstalledAssets);
aE.extractAssets(app, "metadata", outputDir, extractPolicy, false);

// enable with flags?
boolean shouldExtractSnapshots = true;

// will extract snapshot of the device appropriate architecture
Expand All @@ -98,7 +100,7 @@ public static Runtime initRuntime(Application app) {
logger.write("Extracting snapshot blob");
}

aE.extractAssets(app, "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
aE.extractAssets(app, "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy, removePreviouslyInstalledAssets);
}

extractPolicy.setAssetsThumb(app);
Expand Down
40 changes: 39 additions & 1 deletion runtime/src/main/java/com/tns/AssetExtractor.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.tns;

import java.io.File;
import java.io.IOException;

import android.content.Context;
import android.util.Log;
Expand All @@ -13,14 +14,22 @@ public AssetExtractor(File libPath, Logger logger) {
this.logger = logger;
}

public void extractAssets(Context context, String inputPath, String outputPath, ExtractPolicy extractPolicy) {
public void extractAssets(Context context, String inputPath, String outputPath, ExtractPolicy extractPolicy, boolean shouldCleanUpPreviousAssets) {
FileExtractor extractor = extractPolicy.extractor();
if (extractor != null) {
boolean success = extractor.extract(context);
if (logger.isEnabled()) {
logger.write("extract returned " + success);
}
} else if (extractPolicy.shouldExtract(context)) {
if (shouldCleanUpPreviousAssets) {
try {
delete(new File(outputPath + inputPath));
} catch (IOException e) {
Log.d(LogTag, "Problem occurred while deleting assets from previous app version: " + outputPath + inputPath);
}
}

String apkPath = context.getPackageCodePath();

boolean forceOverwrite = extractPolicy.forceOverwrite();
Expand All @@ -32,4 +41,33 @@ public void extractAssets(Context context, String inputPath, String outputPath,
}
}
}

/**
* Delete a file or a directory and its children.
* @param file The directory to delete.
* @throws IOException Exception when problem occurs during deleting the directory.
*/
private static void delete(File file) throws IOException {
File[] files = file.listFiles();
if (files == null) {
Log.d(LogTag, "Can't remove previously installed assets in " + file.getAbsolutePath());
return;
}

for (File childFile : files) {
if (childFile.isDirectory()) {
delete(childFile);
} else {
if (!childFile.delete()) {
throw new IOException();
}
}
}

if (!file.delete()) {
throw new IOException();
}
}

private static String LogTag = "JS: AssetExtraction";
}
22 changes: 18 additions & 4 deletions test-app/app/src/main/java/com/tns/DefaultExtractPolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public DefaultExtractPolicy(Logger logger) {
}

public boolean shouldExtract(Context context) {
String assetsThumbFilePath = context.getFilesDir().getPath() + File.separatorChar + ASSETS_THUMB_FILENAME;
String assetsThumbFilePath = getFilesDir(context) + File.separatorChar + ASSETS_THUMB_FILENAME;
String oldAssetsThumb = getCachedAssetsThumb(assetsThumbFilePath);
if (oldAssetsThumb == null) {
return true;
Expand All @@ -47,7 +47,7 @@ public boolean shouldExtract(Context context) {
public void setAssetsThumb(Context context) {
String assetsThumb = generateAssetsThumb(context);
if (assetsThumb != null) {
String assetsThumbFilePath = context.getFilesDir().getPath() + File.separatorChar + ASSETS_THUMB_FILENAME;
String assetsThumbFilePath = getFilesDir(context) + File.separatorChar + ASSETS_THUMB_FILENAME;
saveNewAssetsThumb(assetsThumb, assetsThumbFilePath);
}
}
Expand Down Expand Up @@ -114,12 +114,26 @@ private void saveNewAssetsThumb(String newThumb, String assetsThumbFile) {
out.close();
}
} catch (FileNotFoundException e) {
logger.write("Error while writting current assets thumb");
logger.write("Error while writing current assets thumb");
e.printStackTrace();
} catch (IOException e) {
logger.write("Error while writting current assets thumb");
logger.write("Error while writing current assets thumb");
e.printStackTrace();
}
}

/*
Write assetsThumb file to a no-backup directory to prevent the thumb from being
backed up on devices of API Level 23 and up.
Devices Level 22 and lower don't support the Auto Backup feature,
so it is safe to keep the thumb in the /files directory
*/
private static String getFilesDir(Context context) {
if (android.os.Build.VERSION.SDK_INT >= /* 21 */ android.os.Build.VERSION_CODES.LOLLIPOP) {
return context.getNoBackupFilesDir().getPath();
} else {
return context.getFilesDir().getPath();
}
}

}
12 changes: 7 additions & 5 deletions test-app/app/src/main/java/com/tns/RuntimeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ public static Runtime initRuntime(Application app) {

String outputDir = app.getFilesDir().getPath() + File.separator;

aE.extractAssets(app, "app", outputDir, extractPolicy);
aE.extractAssets(app, "internal", outputDir, extractPolicy);
aE.extractAssets(app, "metadata", outputDir, extractPolicy);
// will force deletion of previously extracted files in app/files directories
// see https://github.com/NativeScript/NativeScript/issues/4137 for reference
boolean removePreviouslyInstalledAssets = true;
aE.extractAssets(app, "app", outputDir, extractPolicy, removePreviouslyInstalledAssets);
aE.extractAssets(app, "internal", outputDir, extractPolicy, removePreviouslyInstalledAssets);
aE.extractAssets(app, "metadata", outputDir, extractPolicy, false);

// enable with flags?
boolean shouldExtractSnapshots = true;

// will extract snapshot of the device appropriate architecture
Expand All @@ -98,7 +100,7 @@ public static Runtime initRuntime(Application app) {
logger.write("Extracting snapshot blob");
}

aE.extractAssets(app, "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
aE.extractAssets(app, "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy, removePreviouslyInstalledAssets);
}

extractPolicy.setAssetsThumb(app);
Expand Down

0 comments on commit f7a8222

Please sign in to comment.