libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Don't keep a _cache variable, it's never checked

Browse Source
This commit is contained in:
Le Philousophe 2023-03-04 17:57:51 +01:00
parent 316a6974ba
commit 55c9a7529f
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backends/fs/android/android-saf-fs.cpp
View File

@ -249,7 +249,7 @@ AndroidSAFFilesystemNode *AndroidSAFFilesystemNode::makeFromTree(jobject safTree
}
AndroidSAFFilesystemNode::AndroidSAFFilesystemNode(jobject safTree, jobject safNode) :
_cached(false), _flags(0), _safParent(nullptr) {
_flags(0), _safParent(nullptr) {
JNIEnv *env = JNI::getEnv();
@ -263,7 +263,7 @@ AndroidSAFFilesystemNode::AndroidSAFFilesystemNode(jobject safTree, jobject safN
AndroidSAFFilesystemNode::AndroidSAFFilesystemNode(jobject safTree, jobject safParent,
const Common::String &path, const Common::String &name) :
_safNode(nullptr), _cached(false), _flags(0), _safParent(nullptr) {
_safNode(nullptr), _flags(0), _safParent(nullptr) {
JNIEnv *env = JNI::getEnv();
@ -296,7 +296,6 @@ AndroidSAFFilesystemNode::AndroidSAFFilesystemNode(const AndroidSAFFilesystemNod
assert(_safParent);
}
_cached = node._cached;
_path = node._path;
_flags = node._flags;
_newName = node._newName;
@ -478,7 +477,7 @@ Common::SeekableWriteStream *AndroidSAFFilesystemNode::createWriteStream() {
env->DeleteLocalRef(child);
cacheData(true);
cacheData();
}
jint fd = env->CallIntMethod(_safTree, _MID_createWriteStream, _safNode);
@ -539,7 +538,7 @@ bool AndroidSAFFilesystemNode::createDirectory() {
env->DeleteLocalRef(child);
cacheData(true);
cacheData();
return true;
}
@ -612,11 +611,7 @@ void AndroidSAFFilesystemNode::removeTree() {
}
}
void AndroidSAFFilesystemNode::cacheData(bool force) {
if (_cached && !force) {
return;
}
void AndroidSAFFilesystemNode::cacheData() {
JNIEnv *env = JNI::getEnv();
_flags = env->GetIntField(_safNode, _FID__flags);
@ -640,7 +635,6 @@ void AndroidSAFFilesystemNode::cacheData(bool force) {
}
env->DeleteLocalRef(nameObj);
}
_path.clear();
Common::String workingPath;
@ -648,6 +642,7 @@ void AndroidSAFFilesystemNode::cacheData(bool force) {
const char *path = env->GetStringUTFChars(pathObj, 0);
if (path == nullptr) {
env->DeleteLocalRef(pathObj);
error("SAFFSNode::_path is null");
return;
}
workingPath = Common::String(path);
@ -656,22 +651,23 @@ void AndroidSAFFilesystemNode::cacheData(bool force) {
jstring idObj = (jstring)env->CallObjectMethod(_safTree, _MID_getTreeId);
if (env->ExceptionCheck()) {
LOGE("SAFFSTree::getTreeId failed");
env->ExceptionDescribe();
env->ExceptionClear();
env->ReleaseStringUTFChars(pathObj, path);
env->DeleteLocalRef(pathObj);
error("SAFFSTree::getTreeId failed");
return;
}
if (!idObj) {
error("SAFFSTree::getTreeId returned null");
return;
}
const char *id = env->GetStringUTFChars(idObj, 0);
if (id == nullptr) {
error("Failed to get string from SAFFSTree::getTreeId");
env->DeleteLocalRef(idObj);
return;
}
@ -681,8 +677,6 @@ void AndroidSAFFilesystemNode::cacheData(bool force) {
_path += workingPath;
env->ReleaseStringUTFChars(idObj, id);
env->DeleteLocalRef(idObj);
_cached = true;
}
const char AddSAFFakeNode::SAF_ADD_FAKE_PATH[] = "/saf";

3
backends/fs/android/android-saf-fs.h
View File

@ -69,7 +69,6 @@ protected:
// In this case _path is the parent path, _newName the node name and _safParent the parent SAF object
jobject _safNode;
bool _cached;
Common::String _path;
int _flags;
jobject _safParent;
@ -156,7 +155,7 @@ protected:
AndroidSAFFilesystemNode(jobject safTree, jobject safParent,
const Common::String &path, const Common::String &name);
void cacheData(bool force = false);
void cacheData();
};
class AddSAFFakeNode final : public AbstractFSNode, public AndroidFSNode {