Merge branch 'jacek-marchwicki-java-project-instead-of-android'

README.md

@@ -13,21 +13,19 @@ dependencies {
     // snapshot version
     compile 'com.github.mrmike:Ok2Curl:master-SNAPSHOT'
     // or use specific version
-    compile 'com.github.mrmike:Ok2Curl:0.1.1'
+    compile 'com.github.mrmike:Ok2Curl:0.2.0'
 }
 ```
 
-Then install the Ok2Curl interceptor.
+To start logging requests with Ok2Curl add interceptor to OkHttp client.
 ```java
 OkHttpClient okHttp = new OkHttpClient.Builder()
-    .addInterceptor(new CurlInterceptor())
-    .build();
-```
-
-By default Ok2Curl generates logs with `Ok2Curl` tag and log level set to`Log.DEBUG`. You can easily change this by calling
-```java
-OkHttpClient okHttp = new OkHttpClient.Builder()
-    .addInterceptor(new CurlInterceptor("MyTag", Log.DEBUG))
+    .addInterceptor(new CurlInterceptor(new Loggable() {
+            @Override
+            public void log(String message) {
+                Log.v("Ok2Curl", message);
+            }
+        }))
     .build();
 ```
 

ok2curl/build.gradle

@@ -1,26 +1,7 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'java'
 
 group='com.github.mrmike'
-version='0.1.1'
-
-android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 23
-        versionCode 4
-        versionName "0.1.1"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
+version='0.2.0'
 
 dependencies {
     compile 'com.squareup.okhttp3:okhttp:3.0.0'

ok2curl/src/main/java/com/moczul/ok2curl/CurlInterceptor.java

@@ -1,8 +1,5 @@
 package com.moczul.ok2curl;
 
-import android.util.Log;
-
-import com.moczul.ok2curl.logger.AndroidLogger;
 import com.moczul.ok2curl.logger.Loggable;
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -17,19 +14,19 @@ public class CurlInterceptor implements Interceptor {
     private Loggable logger;
 
     public CurlInterceptor() {
-        this(TAG, Log.DEBUG);
+        this(new Loggable() {
+            @Override
+            public void log(String message) {
+                System.out.println(TAG + " " + message);
+            }
+        });
     }
 
     /**
      * Interceptor responsible for printing curl logs
-     * @param tag
-     * @param logLevel
+     * @param logger
      */
-    public CurlInterceptor(String tag, int logLevel) {
-        this.logger = new AndroidLogger(logLevel, tag);
-    }
-
-    /* package */ CurlInterceptor(Loggable logger) {
+    public CurlInterceptor(Loggable logger) {
         this.logger = logger;
     }
 

sample/src/main/java/com/moczul/sample/AndroidLogger.java

@@ -0,0 +1,15 @@
+package com.moczul.sample;
+
+import android.util.Log;
+
+import com.moczul.ok2curl.logger.Loggable;
+
+public class AndroidLogger implements Loggable {
+
+    public static final String TAG = "Ok2Curl";
+
+    @Override
+    public void log(String message) {
+        Log.v(TAG, message);
+    }
+}

sample/src/main/java/com/moczul/sample/RequestService.java

@@ -20,11 +20,7 @@ public RequestService() {
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        /**
-         * Alternatively you can specify tag and log level
-         * CurlInterceptor curlInterceptor = new CurlInterceptor("MyTag", Log.DEBUG);
-         */
-        final CurlInterceptor curlInterceptor = new CurlInterceptor();
+        final CurlInterceptor curlInterceptor = new CurlInterceptor(new AndroidLogger());
 
         final OkHttpClient client = new OkHttpClient.Builder()
                 .addInterceptor(curlInterceptor)