Moved some utility methods from EditorFragment to Utils

wordpress-mobile · Apr 9, 2015 · abcf3e3 · abcf3e3
1 parent 7f336ea
commit abcf3e3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 35 deletions.
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java
@@ -1,9 +1,9 @@
 package org.wordpress.android.editor;
 
 import android.annotation.SuppressLint;
-import android.content.res.AssetManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,10 +23,6 @@
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -95,7 +91,7 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
         });
         mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
-            public boolean onConsoleMessage(ConsoleMessage cm) {
+            public boolean onConsoleMessage(@NonNull ConsoleMessage cm) {
                 AppLog.d(T.EDITOR, cm.message() + " -- From line " + cm.lineNumber() + " of " + cm.sourceId());
                 return true;
             }
@@ -107,7 +103,7 @@ public boolean onJsAlert(WebView view, String url, String message, JsResult resu
             }
         });
 
-        String htmlEditor = getHtmlFromFile("android-editor.html");
+        String htmlEditor = Utils.getHtmlFromFile(getActivity(), "android-editor.html");
 
         mWebView.addJavascriptInterface(new JsCallbackHandler(this), JS_CALLBACK_HANDLER);
 
@@ -124,33 +120,6 @@ public void onClick(View v) {
         }
     }
 
-    private String getStringFromAsset(String filename) throws IOException {
-        if (!isAdded()) {
-            return null;
-        }
-        AssetManager assetManager = getActivity().getAssets();
-        InputStream in = assetManager.open(filename);
-        InputStreamReader is = new InputStreamReader(in);
-        StringBuilder sb = new StringBuilder();
-        BufferedReader br = new BufferedReader(is);
-        String read = br.readLine();
-        while (read != null) {
-            sb.append(read);
-            sb.append('\n');
-            read = br.readLine();
-        }
-        return sb.toString();
-    }
-
-    private String getHtmlFromFile(String filename) {
-        try {
-            return getStringFromAsset(filename);
-        } catch (IOException e) {
-            AppLog.e(T.EDITOR, e.getMessage());
-            return null;
-        }
-    }
-
     @SuppressLint("NewApi")
     private void enableWebDebugging(boolean enable) {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -200,7 +169,7 @@ public void onDomLoaded() {
         mWebView.post(new Runnable() {
             public void run() {
                 String title = "I'm editing a post!";
-                String contentHtml = getHtmlFromFile("example-content.html");
+                String contentHtml = Utils.getHtmlFromFile(getActivity(), "example-content.html");
 
                 mWebView.execJavaScriptFromString("ZSSEditor.getField('zss_field_content').setMultiline('true');");
 

diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/Utils.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/Utils.java
@@ -1,12 +1,46 @@
 package org.wordpress.android.editor;
 
+import android.app.Activity;
+import android.content.res.AssetManager;
+
+import org.wordpress.android.util.AppLog;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
 public class Utils {
+
+    public static String getHtmlFromFile(Activity activity, String filename) {
+        try {
+            AssetManager assetManager = activity.getAssets();
+            InputStream in = assetManager.open(filename);
+            return getStringFromInputStream(in);
+        } catch (IOException e) {
+            AppLog.e(AppLog.T.EDITOR, e.getMessage());
+            return null;
+        }
+    }
+
+    public static String getStringFromInputStream(InputStream inputStream) throws IOException {
+        InputStreamReader is = new InputStreamReader(inputStream);
+        StringBuilder sb = new StringBuilder();
+        BufferedReader br = new BufferedReader(is);
+        String read = br.readLine();
+        while (read != null) {
+            sb.append(read);
+            sb.append('\n');
+            read = br.readLine();
+        }
+        return sb.toString();
+    }
+
     public static String escapeHtml(String html) {
         html = html.replace("\\", "\\\\");
         html = html.replace("\"", "\\\"");