Update to 1.3

Author: bartwell

README.md

@@ -26,51 +26,27 @@ Here is few option to integrate Ultra Debugger in your application.
 
 __1.__ Add in build.gradle:
 ```groovy
-compile 'ru.bartwell:ultradebugger:1.2'
+compile 'ru.bartwell:ultradebugger:1.3'
 ```
 
 __2.__ Add in Application class in onCreate() method:
 ```groovy
-UltraDebugger.start(this);
-```
-
-If you need specify custom port, add it as second argument:
-
-```java
-UltraDebugger.start(this, 8081);
+UltraDebugger.start(this, 8090);
 ```
 
 ##### Add only for debug configurations
 
 __1.__ Add in build.gradle:
 ```groovy
-debugCompile 'ru.bartwell:ultradebugger:1.2'
+debugCompile 'ru.bartwell:ultradebugger:1.3'
+compile 'ru.bartwell:ultradebugger.wrapper:1.3'
 ```
 
 __2.__ Add in Application class in onCreate() method:
 
 ```java
-if (BuildConfig.DEBUG) {
-    try {
-        Class<?> clazz = Class.forName("ru.bartwell.ultradebugger.UltraDebugger");
-        Method method = clazz.getMethod("start", Context.class);
-        method.invoke(null, this);
-    } catch (Exception ignored) {
-    }
-}
-```
-
-If you need specify custom port, add it as second argument:
-
-```java
-if (BuildConfig.DEBUG) {
-    try {
-        Class<?> clazz = Class.forName("ru.bartwell.ultradebugger.UltraDebugger");
-        Method method = clazz.getMethod("start", Context.class, int.class);
-        method.invoke(null, this, 8081);
-    } catch (Exception ignored) {
-    }
-}
+UltraDebuggerWrapper.setEnabled(BuildConfig.DEBUG);
+UltraDebuggerWrapper.start(this, 8090);
 ```
 
 _Default port number is 8080._

app/build.gradle

@@ -16,6 +16,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+        dev {}
+        master {}
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:overrideLibrary="android.support.v7.appcompat">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/java/ru/bartwell/ultradebugger/sampleapp/DebuggerApplication.java

@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-import ru.bartwell.ultradebugger.UltraDebugger;
+import ru.bartwell.ultradebugger.wrapper.UltraDebuggerWrapper;
 
 /**
  * Created by BArtWell on 01.01.2017.
@@ -12,6 +12,7 @@ public class DebuggerApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        UltraDebugger.start(this, 8081);
+        UltraDebuggerWrapper.setEnabled(BuildConfig.FLAVOR.equals("dev"));
+        UltraDebuggerWrapper.start(this, 8081);
     }
 }

app/src/main/java/ru/bartwell/ultradebugger/sampleapp/MainActivity.java

@@ -11,8 +11,7 @@
 
 import java.util.Random;
 
-import ru.bartwell.ultradebugger.UltraDebugger;
-import ru.bartwell.ultradebugger.module.logger.Logger;
+import ru.bartwell.ultradebugger.wrapper.UltraDebuggerWrapper;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -24,12 +23,12 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         // Fill information about IP and port
-        String ip = UltraDebugger.getIp();
+        String ip = UltraDebuggerWrapper.getIp();
         String address;
         if (TextUtils.isEmpty(ip)) {
-            address = getString(R.string.unknown_ip_format, UltraDebugger.getPort());
+            address = getString(R.string.unknown_ip);
         } else {
-            address = getString(R.string.ip_format, ip, UltraDebugger.getPort());
+            address = getString(R.string.ip_format, ip, UltraDebuggerWrapper.getPort());
         }
         ((TextView) findViewById(R.id.url)).setText(address);
 
@@ -53,13 +52,13 @@ public void showToast(String text) {
     @Override
     protected void onResume() {
         super.onResume();
-        Logger.saveValue(this, "RandomValue", new Random().nextInt(100));
-        Logger.addLog(this, "onResume");
+        UltraDebuggerWrapper.saveValue(this, "RandomValue", new Random().nextInt(100));
+        UltraDebuggerWrapper.addLog(this, "onResume");
     }
 
     @Override
     protected void onPause() {
-        Logger.addLog(this, "onPause");
+        UltraDebuggerWrapper.addLog(this, "onPause");
         super.onPause();
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -22,14 +22,4 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         tools:text="http://xxx.xxx.xxx.xxx:8080"/>
-
-    <TextView
-        style="@style/TextAppearance.AppCompat.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="15dp"
-        android:text="@string/ip_note"/>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">Ultra Debugger Sample App</string>
     <string name="type_address_description">Please connect your smartphone and computer to same network, open browser on computer and type address:</string>
-    <string name="ip_note">Change xxx.xxx.xxx.xxx to IP of your smartphone</string>
-    <string name="unknown_ip_format">http://xxx.xxx.xxx.xxx:%d</string>
+    <string name="unknown_ip">Unknown IP address</string>
     <string name="ip_format">http://%1$s:%2$d</string>
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -16,8 +16,8 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.2
-VERSION_CODE=3
+VERSION_NAME=1.3
+VERSION_CODE=4
 GROUP=ru.bartwell
 
 POM_DESCRIPTION=Ultra Debugger is an open source modules-based android library for application debugging.

logger/src/main/java/ru/bartwell/ultradebugger/module/logger/Logger.java

@@ -4,13 +4,27 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /**
  * Created by BArtWell on 24.02.2017.
  */
 
 public class Logger {
     public static void addLog(@NonNull Context context, @NonNull String text) {
-        StorageHelper.addLog(context, text);
+        addLog(context, text, null);
+    }
+
+    public static void addLog(@NonNull Context context, @NonNull String text, @Nullable Throwable throwable) {
+        if (throwable == null) {
+            StorageHelper.addLog(context, text);
+        } else {
+            StringWriter stringWriter = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(stringWriter);
+            throwable.printStackTrace(printWriter);
+            addLog(context, text + "\n" + stringWriter.toString() + "\n");
+        }
     }
 
     public static void saveValue(@NonNull Context context, @NonNull String key, @Nullable Object value) {

settings.gradle

@@ -1 +1 @@
-include ':app', ':ultradebugger', ':sqlite', ':sharedpreferences', ':base', ':reflection', ':info', ':files', ':logger'
+include ':app', ':ultradebugger', ':sqlite', ':sharedpreferences', ':base', ':reflection', ':info', ':files', ':logger', ':wrapper'

shared.gradle

@@ -5,8 +5,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 25
-        versionCode 3
-        versionName "1.2"
+        versionCode 4
+        versionName "1.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

ultradebugger/build.gradle

@@ -18,6 +18,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'org.nanohttpd:nanohttpd:2.3.1'
+    compile project(':wrapper')
     compile project(':base')
     compile project(':sqlite')
     compile project(':sharedpreferences')

ultradebugger/src/main/java/ru/bartwell/ultradebugger/UltraDebugger.java

@@ -1,6 +1,7 @@
 package ru.bartwell.ultradebugger;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -17,19 +18,19 @@ public class UltraDebugger {
     private static String sIp;
     private static int sPort;
 
-    public static void start(Context context) {
+    public static void start(@NonNull Context context) {
         start(context, HttpServer.DEFAULT_PORT);
     }
 
-    public static void start(Context context, int port) {
+    public static void start(@NonNull Context context, int port) {
         sIp = IpUtils.getIpV4();
         sPort = port;
         addLogInfo(port);
         ModulesManager.newInstance(context);
         ServerService.start(context, port);
     }
 
-    public static void stop(Context context) {
+    public static void stop(@NonNull Context context) {
         ServerService.stop(context);
     }
 

wrapper/.gitignore

@@ -0,0 +1 @@
+/build

wrapper/build.gradle

@@ -0,0 +1,14 @@
+apply plugin: 'com.android.library'
+
+apply from: "../shared.gradle"
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    testCompile 'junit:junit:4.12'
+}
+
+apply from: '../maven_push.gradle'

wrapper/gradle.properties

@@ -0,0 +1,3 @@
+POM_NAME=Ultra Debugger Wrapper
+POM_ARTIFACT_ID=ultradebugger.wrapper
+POM_PACKAGING=aar

wrapper/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\BArtWell\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

wrapper/src/androidTest/java/ru/bartwell/ultradebugger/wrapper/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package ru.bartwell.ultradebugger.wrapper;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("ru.bartwell.ultradebugger.wrapper.test", appContext.getPackageName());
+    }
+}

wrapper/src/main/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+          package="ru.bartwell.ultradebugger.wrapper"
+>
+
+    <application android:allowBackup="true"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+    >
+
+    </application>
+
+</manifest>