Skip to content

[Android]Override removeDirectory function in FileUtilsAndroid, fix "rm not found" error on OPPO ColorOS #19790

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.

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

Merged
merged 4 commits into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions cocos/platform/android/CCFileUtils-android.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,14 @@ std::vector<std::string> FileUtilsAndroid::listFiles(const std::string& dirPath)
return fileList;
}

bool FileUtilsAndroid::removeDirectory(const std::string& path) const
{
if (path.empty())
return false;

return removeDirectoryJNI(path.c_str());
}

FileUtils::Status FileUtilsAndroid::getContents(const std::string& filename, ResizableBuffer* buffer) const
{
static const std::string apkprefix("assets/");
Expand Down
2 changes: 2 additions & 0 deletions cocos/platform/android/CCFileUtils-android.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class CC_DLL FileUtilsAndroid : public FileUtils

virtual long getFileSize(const std::string& filepath) const override;
virtual std::vector<std::string> listFiles(const std::string& dirPath) const override;

virtual bool removeDirectory(const std::string& dirPath) const override;
private:
virtual bool isFileExistInternal(const std::string& strFilePath) const override;
virtual bool isDirectoryExistInternal(const std::string& dirPath) const override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,39 @@ public boolean accept(File dir, String name) {

return Cocos2dxHelper.sAssetsPath;
}

//remove directory
public static boolean removeDirectory(final String directory)
{
try{
File file = new File(directory);
recursionDeleteFile(file);
return true;
}catch(Exception ex){
ex.printStackTrace();
return false;
}
}


private static void recursionDeleteFile(File file)
{
if (file.isFile()) {
file.delete();
return;
}
if (file.isDirectory()) {
File[] childrenFile = file.listFiles();
if (childrenFile == null || childrenFile.length == 0) {
file.delete();
return;
}
for (File f : childrenFile) {
recursionDeleteFile(f);
}
file.delete();
}
}

public static ZipResourceFile getObbFile() {
if (null == sOBBFile) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,21 @@ void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharse
methodInfo.env->DeleteLocalRef(methodInfo.classID);
}
}


bool removeDirectoryJNI(const char* path)
{
JniMethodInfo methodInfo;
if (JniHelper::getStaticMethodInfo(methodInfo,className.c_str(),"removeDirectory","(Ljava/lang/String;)Z"))
{
jstring stringArgPath = methodInfo.env->NewStringUTF(path);
jboolean suc = methodInfo.env->CallStaticBooleanMethod(methodInfo.classID,methodInfo.methodID,stringArgPath);

methodInfo.env->DeleteLocalRef(methodInfo.classID);
methodInfo.env->DeleteLocalRef(stringArgPath);

return suc;
}

return false;
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ extern const char * getApkPath();
extern std::string getPackageNameJNI();
extern int getObbAssetFileDescriptorJNI(const char* path, long* startOffset, long* size);
extern void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharset, char* dst, const char* newCharset);
extern bool removeDirectoryJNI(const char* path);

extern int getDeviceSampleRate();
extern int getDeviceAudioBufferSizeInFrames();
Expand Down