From 53d758ccbb7d2e60348a2f87cabb2bade2b76552 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 18 Apr 2023 19:30:29 +0200
Subject: [PATCH] guard against mp4parser init class def error

---
 .../kotlin/deckers/thibault/aves/metadata/Mp4ParserHelper.kt    | 2 ++
 .../app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt   | 2 ++
 .../deckers/thibault/aves/model/provider/ImageProvider.kt       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Mp4ParserHelper.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Mp4ParserHelper.kt
index 1c89c00a1..fbf7cdab3 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Mp4ParserHelper.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/Mp4ParserHelper.kt
@@ -281,6 +281,8 @@ object Mp4ParserHelper {
                     }
                 }
             }
+        } catch (e: NoClassDefFoundError) {
+            Log.w(LOG_TAG, "failed to parse MP4 for mimeType=$mimeType uri=$uri", e)
         } catch (e: Exception) {
             Log.w(LOG_TAG, "failed to get User Data box by MP4 parser for mimeType=$mimeType uri=$uri", e)
         }
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
index 939bd7076..cb721c9c1 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
@@ -175,6 +175,8 @@ object XMP {
                     }
                 }
             }
+        } catch (e: NoClassDefFoundError) {
+            Log.w(LOG_TAG, "failed to parse MP4 for mimeType=$mimeType uri=$uri", e)
         } catch (e: Exception) {
             Log.w(LOG_TAG, "failed to get XMP by MP4 parser for mimeType=$mimeType uri=$uri", e)
         }
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
index 05fb4df29..c84596bea 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
@@ -815,6 +815,8 @@ abstract class ImageProvider {
                     }
                 }
             }
+        } catch (e: NoClassDefFoundError) {
+            callback.onFailure(e)
         } catch (e: Exception) {
             callback.onFailure(e)
             return false