Skip to content

Commit 1b5d1fd

Browse files
committed
add dependency on WordPressUtils and use AppLog instead of Log
1 parent 86805a0 commit 1b5d1fd

File tree

4 files changed

+13
-21
lines changed

4 files changed

+13
-21
lines changed

editor/src/main/java/org/wordpress/android/editor/EditorActivity.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
package org.wordpress.android.editor;
22

3-
import android.annotation.SuppressLint;
4-
import android.content.res.AssetManager;
53
import android.os.Bundle;
64
import android.support.v7.app.ActionBarActivity;
7-
import android.util.Log;
8-
import android.webkit.ConsoleMessage;
9-
import android.webkit.JsResult;
10-
import android.webkit.WebChromeClient;
11-
import android.webkit.WebSettings;
12-
import android.webkit.WebView;
13-
import android.webkit.WebViewClient;
14-
15-
import java.io.BufferedReader;
16-
import java.io.IOException;
17-
import java.io.InputStream;
18-
import java.io.InputStreamReader;
195

206
public class EditorActivity extends ActionBarActivity {
217
@Override

editor/src/main/java/org/wordpress/android/editor/EditorFragment.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.res.AssetManager;
55
import android.os.Bundle;
66
import android.support.v4.app.Fragment;
7-
import android.util.Log;
87
import android.view.LayoutInflater;
98
import android.view.View;
109
import android.view.ViewGroup;
@@ -15,6 +14,9 @@
1514
import android.webkit.WebView;
1615
import android.webkit.WebViewClient;
1716

17+
import org.wordpress.android.util.AppLog;
18+
import org.wordpress.android.util.AppLog.T;
19+
1820
import java.io.BufferedReader;
1921
import java.io.IOException;
2022
import java.io.InputStream;
@@ -63,32 +65,31 @@ public void onDetach() {
6365
super.onDetach();
6466
}
6567

66-
// TODO: use AppLog instead of Log
6768
@SuppressLint("SetJavaScriptEnabled")
6869
private void initWebView() {
6970
WebSettings webSettings = mWebView.getSettings();
7071
webSettings.setJavaScriptEnabled(true);
7172
webSettings.setDefaultTextEncodingName("utf-8");
7273
mWebView.setWebViewClient(new WebViewClient() {
7374
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
74-
Log.e("WordPress-Editor", description);
75+
AppLog.e(T.EDITOR, description);
7576
}
7677
});
7778
mWebView.setWebChromeClient(new WebChromeClient() {
7879
public boolean onConsoleMessage(ConsoleMessage cm) {
79-
Log.e("WordPress-Editor", cm.message() + " -- From line " + cm.lineNumber() + " of " + cm.sourceId());
80+
AppLog.e(T.EDITOR, cm.message() + " -- From line " + cm.lineNumber() + " of " + cm.sourceId());
8081
return true;
8182
}
8283

8384
@Override
8485
public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
85-
Log.e("WordPress-Editor", message);
86+
AppLog.e(T.EDITOR, message);
8687
return true;
8788
}
8889

8990
@Override
9091
public void onConsoleMessage(String message, int lineNumber, String sourceId) {
91-
Log.e("WordPress-Editor", message + " -- from line " + lineNumber + " of " + sourceId);
92+
AppLog.e(T.EDITOR, message + " -- from line " + lineNumber + " of " + sourceId);
9293
}
9394
});
9495
String htmlEditor = getHtmlEditor();
@@ -117,7 +118,7 @@ private String getHtmlEditor() {
117118
try {
118119
return getStringFromAsset("android-editor.html");
119120
} catch (IOException e) {
120-
Log.e("WordPress-Editor", e.getMessage());
121+
AppLog.e(T.EDITOR, e.getMessage());
121122
return null;
122123
}
123124
}

example/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ buildscript {
77
}
88
}
99

10+
repositories {
11+
mavenCentral()
12+
}
13+
1014
apply plugin: 'com.android.application'
1115

1216
android {

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
include ':editor'
22
include ':example'
3+
include ':libs:utils:WordPressUtils'

0 commit comments

Comments
 (0)