merge fixes

signed-off-by: niendo1 <peter@niendo.de>
Signed-off-by: niendo1 <peter@niendo.de>

Author: niendo1

richeditor/src/main/java/jp/wasabeef/richeditor/RichEditor.java

@@ -507,26 +507,27 @@ public void insertImage(String url, String alt, String width, String height, Boo
     exec("javascript:RE.insertImage('" + url + "', '" + alt + "','" + width + "', '" + height + "', '" + relative.toString() + "');");
   }
 
-    public void insertImageAsBase64(Uri imageURI, String alt, String width, String height, Boolean relative) {
-      InputStream inputStream = null;
-      try {
-        inputStream = getContext().getContentResolver().openInputStream(imageURI);
-      } catch (FileNotFoundException e) {
-        e.printStackTrace();
-      }
+  public void insertImageAsBase64(Uri imageURI, String alt, String width, String height) {
+    InputStream inputStream = null;
+    try {
+      inputStream = getContext().getContentResolver().openInputStream(imageURI);
+    } catch (FileNotFoundException e) {
+      e.printStackTrace();
+    }
 
-      Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
-      try {
-        inputStream.close();
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-      String type = getContext().getContentResolver().getType(imageURI).toLowerCase();
-      String tag = "data:" + type + ";charset=utf-8;base64,";
-      exec("javascript:RE.prepareInsert();");
-      exec("javascript:RE.insertImage('" + tag + Utils.toBase64(bitmap, type) + "','" + alt + "','" + width + "', '" + height + "', '" + relative.toString() + "');");
-      //exec("javascript:RE.insertImage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==','alt');");
+    Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+    try {
+      inputStream.close();
+    } catch (IOException e) {
+      e.printStackTrace();
     }
+    //String format = getContext().getContentResolver().getType(imageURI).toLowerCase();
+    String format = "png";
+    String tag = "data:image/" + format + ";charset=utf-8;base64,";
+    exec("javascript:RE.prepareInsert();");
+    exec("javascript:RE.insertImage('" + tag + Utils.toBase64(bitmap, format) + "','" + alt + "','" + width + "', '" + height + "');");
+    //exec("javascript:RE.insertImage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==','alt');");
+  }
 
   /**
    * {@link RichEditor#insertVideo(String, String, String, String)} will show the original size of the video.