Merge pull request #14114 from wordpress-mobile/fix/skip-video-compre…

…ssion-on-error Video compression: managing npe and tracking it in MEDIA_VIDEO_CANT_OPTIMIZE event
wordpress-mobile · Mar 3, 2021 · 707a286 · 707a286
2 parents 7b466e7 + 4f2b76e
commit 707a286
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java
@@ -85,18 +85,31 @@ public void start() {
 
         mOutputPath = mCacheDir.getPath() + "/" + mFilename;
 
-        MediaComposer mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
-                getContext(),
-                mInputPath,
-                mOutputPath,
-                this,
-                AppPrefs.getVideoOptimizeWidth(),
-                AppPrefs.getVideoOptimizeQuality());
+        MediaComposer mediaComposer = null;
+        boolean wasNpeDetected = false;
+
+        try {
+            mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
+                    getContext(),
+                    mInputPath,
+                    mOutputPath,
+                    this,
+                    AppPrefs.getVideoOptimizeWidth(),
+                    AppPrefs.getVideoOptimizeQuality());
+        } catch (NullPointerException npe) {
+            AppLog.w(
+                    AppLog.T.MEDIA,
+                    "VideoOptimizer > NullPointerException while getting composer " + npe.getMessage()
+            );
+            wasNpeDetected = true;
+        }
 
         if (mediaComposer == null) {
             AppLog.w(AppLog.T.MEDIA, "VideoOptimizer > null composer");
-            AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, AnalyticsUtils.getMediaProperties(getContext(), true,
-                    null, mInputPath));
+            Map<String, Object> properties = AnalyticsUtils.getMediaProperties(getContext(), true,
+                    null, mInputPath);
+            properties.put("was_npe_detected", wasNpeDetected);
+            AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, properties);
             mListener.onVideoOptimizationCompleted(mMedia);
             return;
         }