minor fixes
This commit is contained in:
parent
9f7fd2b049
commit
832a683607
5 changed files with 9 additions and 4 deletions
|
@ -208,8 +208,8 @@ dependencies {
|
||||||
// - https://jitpack.io/p/deckerst/mp4parser
|
// - https://jitpack.io/p/deckerst/mp4parser
|
||||||
// - https://jitpack.io/p/deckerst/pixymeta-android
|
// - https://jitpack.io/p/deckerst/pixymeta-android
|
||||||
implementation 'com.github.deckerst:Android-TiffBitmapFactory:90c06eebf4'
|
implementation 'com.github.deckerst:Android-TiffBitmapFactory:90c06eebf4'
|
||||||
implementation 'com.github.deckerst.mp4parser:isoparser:86d4b6baa1'
|
implementation 'com.github.deckerst.mp4parser:isoparser:d5caf7a3dd'
|
||||||
implementation 'com.github.deckerst.mp4parser:muxer:86d4b6baa1'
|
implementation 'com.github.deckerst.mp4parser:muxer:d5caf7a3dd'
|
||||||
implementation 'com.github.deckerst:pixymeta-android:9ec7097f17'
|
implementation 'com.github.deckerst:pixymeta-android:9ec7097f17'
|
||||||
implementation project(':exifinterface')
|
implementation project(':exifinterface')
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ class MediaStoreHandler(private val context: Context) : MethodCallHandler {
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
// may yield `IllegalArgumentException: Volume external_primary not found`
|
// may yield `IllegalArgumentException: Volume external_primary not found`
|
||||||
val volumes = MediaStore.getExternalVolumeNames(context).joinToString(", ")
|
val volumes = MediaStore.getExternalVolumeNames(context).joinToString(", ")
|
||||||
result.error("getGeneration-primary", e.message + " (available volumes are $volumes)", e)
|
result.error("getGeneration-primary", e.message + " (available volumes are [$volumes])", e)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -50,6 +50,7 @@ internal class FileImageProvider : ImageProvider() {
|
||||||
}
|
}
|
||||||
} catch (e: SecurityException) {
|
} catch (e: SecurityException) {
|
||||||
callback.onFailure(e)
|
callback.onFailure(e)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.fillPreCatalogMetadata(context, safe = false)
|
entry.fillPreCatalogMetadata(context, safe = false)
|
||||||
|
|
|
@ -209,6 +209,7 @@ abstract class ImageProvider {
|
||||||
) {
|
) {
|
||||||
if (!supportedExportMimeTypes.contains(imageExportMimeType)) {
|
if (!supportedExportMimeTypes.contains(imageExportMimeType)) {
|
||||||
callback.onFailure(Exception("unsupported export MIME type=$imageExportMimeType"))
|
callback.onFailure(Exception("unsupported export MIME type=$imageExportMimeType"))
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val targetDirDocFile = StorageUtils.createDirectoryDocIfAbsent(activity, targetDir)
|
val targetDirDocFile = StorageUtils.createDirectoryDocIfAbsent(activity, targetDir)
|
||||||
|
@ -858,6 +859,7 @@ abstract class ImageProvider {
|
||||||
}
|
}
|
||||||
} catch (e: NoClassDefFoundError) {
|
} catch (e: NoClassDefFoundError) {
|
||||||
callback.onFailure(e)
|
callback.onFailure(e)
|
||||||
|
return false
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
callback.onFailure(e)
|
callback.onFailure(e)
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -69,7 +69,9 @@ class PlatformMediaStoreService implements MediaStoreService {
|
||||||
try {
|
try {
|
||||||
return await _platform.invokeMethod('getGeneration');
|
return await _platform.invokeMethod('getGeneration');
|
||||||
} on PlatformException catch (e, stack) {
|
} on PlatformException catch (e, stack) {
|
||||||
await reportService.recordError(e, stack);
|
if (e.code != 'getGeneration-primary') {
|
||||||
|
await reportService.recordError(e, stack);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue