From 1ae633dede98dc1db0c7cc3f93bf5f62a9382f39 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sat, 13 Jun 2020 23:23:00 +0900
Subject: [PATCH] handle `NoClassDefFoundError: Failed resolution of:
 Ljava/awt/Point;` in metadata-extractor:2.14.0

---
 .../thibault/aves/channel/calls/MetadataHandler.java        | 6 +++---
 .../main/java/deckers/thibault/aves/model/ImageEntry.java   | 2 +-
 .../deckers/thibault/aves/model/provider/ImageProvider.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java b/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java
index 59a52a5d4..247eb034e 100644
--- a/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java
+++ b/android/app/src/main/java/deckers/thibault/aves/channel/calls/MetadataHandler.java
@@ -144,7 +144,7 @@ public class MetadataHandler implements MethodChannel.MethodCallHandler {
                 }
             }
             result.success(metadataMap);
-        } catch (ImageProcessingException e) {
+        } catch (ImageProcessingException | NoClassDefFoundError e) {
             getAllVideoMetadataFallback(call, result);
         } catch (Exception e) {
             result.error("getAllMetadata-exception", "failed to get metadata for uri=" + uri, e.getMessage());
@@ -292,7 +292,7 @@ public class MetadataHandler implements MethodChannel.MethodCallHandler {
                 }
             }
             result.success(metadataMap);
-        } catch (Exception e) {
+        } catch (Exception | NoClassDefFoundError e) {
             result.error("getCatalogMetadata-exception", "failed to get metadata for uri=" + uri, e.getMessage());
         }
     }
@@ -320,7 +320,7 @@ public class MetadataHandler implements MethodChannel.MethodCallHandler {
                 }
             }
             result.success(metadataMap);
-        } catch (Exception e) {
+        } catch (Exception | NoClassDefFoundError e) {
             result.error("getOverlayMetadata-exception", "failed to get metadata for uri=" + uri, e.getMessage());
         }
     }
diff --git a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
index 742782aaf..e6bbb6f98 100644
--- a/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
+++ b/android/app/src/main/java/deckers/thibault/aves/model/ImageEntry.java
@@ -237,7 +237,7 @@ public class ImageEntry {
                     }
                 }
             }
-        } catch (IOException | ImageProcessingException | MetadataException e) {
+        } catch (IOException | ImageProcessingException | MetadataException | NoClassDefFoundError e) {
             // ignore
         }
     }
diff --git a/android/app/src/main/java/deckers/thibault/aves/model/provider/ImageProvider.java b/android/app/src/main/java/deckers/thibault/aves/model/provider/ImageProvider.java
index b213556e5..4dae163fb 100644
--- a/android/app/src/main/java/deckers/thibault/aves/model/provider/ImageProvider.java
+++ b/android/app/src/main/java/deckers/thibault/aves/model/provider/ImageProvider.java
@@ -146,7 +146,7 @@ public abstract class ImageProvider {
                     return fileTypeDir.getString(FileTypeDirectory.TAG_DETECTED_FILE_MIME_TYPE);
                 }
             }
-        } catch (IOException | ImageProcessingException e) {
+        } catch (IOException | ImageProcessingException | NoClassDefFoundError e) {
             Log.w(LOG_TAG, "failed to get mime type from metadata for uri=" + uri, e);
         }
         return null;