open/vlc-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

medialibrary: Handle DeviceRemovedException

Browse Source 
(cherry picked from commit 5bea429576)
This commit is contained in:
Hugo Beauzée-Luyssen
2019-08-29 14:52:14 +02:00
committed by Geoffrey Métais
parent c42984a5fc
commit dd91226044
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
medialibrary/jni/medialibrary.cpp
View File

@@ -5,6 +5,7 @@
#include <jni.h>
#include <medialibrary/IDeviceLister.h>
#include <medialibrary/filesystem/IDevice.h>
#define LOG_TAG "VLC/JNI/MediaLibrary"
#include "log.h"
#include "utils.h"
@@ -1714,9 +1715,16 @@ folders(JNIEnv* env, jobject thiz, jint type, jint sortingCriteria, jboolean des
jobjectArray foldersRefs = (jobjectArray) env->NewObjectArray(foldersList.size(), ml_fields.Folder.clazz, NULL);
int index = -1;
for(medialibrary::FolderPtr const& folder : foldersList) {
jobject item = convertFolderObject(env, &ml_fields, folder);
env->SetObjectArrayElement(foldersRefs, ++index, item);
env->DeleteLocalRef(item);
try
{
jobject item = convertFolderObject(env, &ml_fields, folder);
env->SetObjectArrayElement(foldersRefs, ++index, item);
env->DeleteLocalRef(item);
}
catch( const medialibrary::fs::DeviceRemovedException& )
{
// Ignore this folder since it's on a removed device.
}
}
return foldersRefs;
}