Merge branch 'master' into master

blink22 · Nov 24, 2017 · 53ef188 · 53ef188
2 parents d2400dc + 56a6c32
commit 53ef188
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -13,8 +13,8 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         minSdkVersion 16
@@ -33,5 +33,5 @@ repositories {
 
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.20.+'
+    compile 'com.facebook.react:react-native:+'
 }
diff --git a/android/src/main/java/com/christopherdro/htmltopdf/RNHTMLtoPDFModule.java b/android/src/main/java/com/christopherdro/htmltopdf/RNHTMLtoPDFModule.java
@@ -48,7 +48,11 @@ public void convert(final ReadableMap options, final Promise promise) {
       }
 
       if (options.hasKey("directory") && options.getString("directory").equals("docs")) {
-        File path = new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOCUMENTS);
+        String state = Environment.getExternalStorageState();
+          File path = (Environment.MEDIA_MOUNTED.equals(state)) ?
+                  new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOCUMENTS)
+                  : new File(mReactContext.getFilesDir(), Environment.DIRECTORY_DOCUMENTS);
+
         if (!path.exists()) path.mkdir();
         destinationFile = new File(path, fileName + ".pdf");
       } else {

diff --git a/android/src/main/java/com/christopherdro/htmltopdf/RNHTMLtoPDFPackage.java b/android/src/main/java/com/christopherdro/htmltopdf/RNHTMLtoPDFPackage.java
@@ -12,7 +12,6 @@
 
 public class RNHTMLtoPDFPackage implements ReactPackage {
 
-    @Override
     public List<Class<? extends JavaScriptModule>> createJSModules() {
         return Collections.emptyList();
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-html-to-pdf",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "scripts": {
     "start": "node_modules/react-native/packager/packager.sh"
   },