From b664c3010a0ae531c15aae2e484e2034edf9fca3 Mon Sep 17 00:00:00 2001 From: Mark <1989329376@qq.com> Date: Wed, 23 Sep 2020 14:25:10 +0800 Subject: [PATCH] mark - Fix about AndroidX and Fix file download failed --- .../src/main/java/com/philipphecht/FileProviderClass.java | 2 +- .../src/main/java/com/philipphecht/RNDocViewerModule.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/com/philipphecht/FileProviderClass.java b/android/src/main/java/com/philipphecht/FileProviderClass.java index 9147675b..47ab36b9 100644 --- a/android/src/main/java/com/philipphecht/FileProviderClass.java +++ b/android/src/main/java/com/philipphecht/FileProviderClass.java @@ -1,4 +1,4 @@ package com.philipphecht; -public class FileProviderClass extends android.support.v4.content.FileProvider { +public class FileProviderClass extends androidx.core.content.FileProvider { } \ No newline at end of file diff --git a/android/src/main/java/com/philipphecht/RNDocViewerModule.java b/android/src/main/java/com/philipphecht/RNDocViewerModule.java index b1693256..eba4c08e 100644 --- a/android/src/main/java/com/philipphecht/RNDocViewerModule.java +++ b/android/src/main/java/com/philipphecht/RNDocViewerModule.java @@ -9,7 +9,6 @@ import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.views.webview.ReactWebViewManager; /* bridge react native int size(); @@ -31,7 +30,7 @@ import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.content.ActivityNotFoundException; import android.content.Context; @@ -250,11 +249,11 @@ private File downloadFile(String url, String fileName, Boolean cache, String fil return f; } catch (Exception err) { - err.printStackTrace(); + callback.invoke(ERROR_FILE_NOT_FOUND); + err.printStackTrace(); } finally { conn.disconnect(); } - return null; }