Merge pull request #176 from AWDGroup/patch-1

gre · web-flow · commit f32408d7cefb · 2018-10-05T10:11:11.000+02:00
Fixed the compile error
diff --git a/android/src/main/java/fr/greweb/reactnativeviewshot/ViewShot.java b/android/src/main/java/fr/greweb/reactnativeviewshot/ViewShot.java
@@ -104,10 +104,11 @@ public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
                 final byte[] bytes = os.toByteArray();
                 String data = Base64.encodeToString(bytes, Base64.NO_WRAP);
                 // correct the extension if JPG
+                String imageFormat = extension;
                 if ("jpg".equals(extension)) {
-                    extension = "jpeg";
+                    imageFormat = "jpeg";
                 }
-                data = "data:image/"+extension+";base64," + data;
+                data = "data:image/"+imageFormat+";base64," + data;
                 promise.resolve(data);
             }
         } catch (Exception e) {

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,11 @@ public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {`
`104`	`104`	`final byte[] bytes = os.toByteArray();`
`105`	`105`	`String data = Base64.encodeToString(bytes, Base64.NO_WRAP);`
`106`	`106`	`// correct the extension if JPG`
	`107`	`+ String imageFormat = extension;`
`107`	`108`	`if ("jpg".equals(extension)) {`
`108`		`- extension = "jpeg";`
	`109`	`+ imageFormat = "jpeg";`
`109`	`110`	`}`
`110`		`- data = "data:image/"+extension+";base64," + data;`
	`111`	`+ data = "data:image/"+imageFormat+";base64," + data;`
`111`	`112`	`promise.resolve(data);`
`112`	`113`	`}`
`113`	`114`	`} catch (Exception e) {`