Merge branch 'release/0.0.8'

Aman · Aman · commit 1c4c4d91a867 · 2018-01-30T18:33:40.000+05:30
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ The library is available on [`mavenCentral()`](https://dl.bintray.com/piyushgupt
 ```
 dependencies {
     ...
-    compile 'com.hypertrack:hyperlog:0.0.7'
+    compile 'com.hypertrack:hyperlog:0.0.8'
     ...
 }
 ```
diff --git a/hyperlog-demo/build.gradle b/hyperlog-demo/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.3'
     defaultConfig {
         applicationId "com.hypertrack.hyperlog_demo"
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,7 +25,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.hypertrack:hyperlog:0.0.7'
-    //compile(project(':hyperlog'));
+    //compile 'com.hypertrack:hyperlog:0.0.7'
+    compile(project(':hyperlog'));
     testCompile 'junit:junit:4.12'
 }
diff --git a/hyperlog-demo/src/main/java/com/hypertrack/hyperlog_demo/CustomLogMessageFormat.java b/hyperlog-demo/src/main/java/com/hypertrack/hyperlog_demo/CustomLogMessageFormat.java
@@ -37,9 +37,9 @@ class CustomLogMessageFormat extends LogFormat {
     }
 
     @Override
-    public String getFormattedLogMessage(String logLevelName, String message, String timeStamp,
+    public String getFormattedLogMessage(String logLevelName, String tag, String message, String timeStamp,
                                          String senderName, String osVersion, String deviceUUID) {
-        String formattedMessage = timeStamp + " : " + logLevelName + " : " + deviceUUID + " : " + message;
+        String formattedMessage = timeStamp + " : " + logLevelName+"/"+tag + " : " + deviceUUID + " : " + message;
         return formattedMessage;
     }
 }
diff --git a/hyperlog-demo/src/main/java/com/hypertrack/hyperlog_demo/MainActivity.java b/hyperlog-demo/src/main/java/com/hypertrack/hyperlog_demo/MainActivity.java
@@ -112,7 +112,6 @@ public void deleteLogs(View view) {
         HyperLog.deleteLogs();
         logsList.clear();
         listAdapter.notifyDataSetChanged();
-
     }
 
     public void nextLog(View view) {
@@ -155,6 +154,4 @@ private void showToast(String message) {
         toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);
         toast.show();
     }
-
-
 }
diff --git a/hyperlog/build.gradle b/hyperlog/build.gradle
@@ -26,12 +26,12 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
 
@@ -54,7 +54,7 @@ dependencies {
     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.4.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.volley:volley:1.0.0'
     compile 'com.google.code.gson:gson:2.8.0'
     testCompile 'junit:junit:4.12'
diff --git a/hyperlog/gradle.properties b/hyperlog/gradle.properties
@@ -1,4 +1,4 @@
-#Wed Dec 13 13:52:20 IST 2017
-version=0.0.7
-VERSION_BUILD=378
-VERSION_PATCH=7
+#Tue Jan 30 12:15:30 IST 2018
+version=0.0.8
+VERSION_BUILD=385
+VERSION_PATCH=8
diff --git a/hyperlog/src/main/AndroidManifest.xml b/hyperlog/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
     package="com.hypertrack.hyperlog">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
+    <application android:label="@string/app_name"
         android:supportsRtl="true">
     </application>
-</manifest>
+</manifest>
diff --git a/hyperlog/src/main/java/com/hypertrack/hyperlog/DeviceLogDatabaseHelper.java b/hyperlog/src/main/java/com/hypertrack/hyperlog/DeviceLogDatabaseHelper.java
@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
 
 import java.util.List;
 
@@ -65,13 +66,13 @@ static DeviceLogDatabaseHelper getInstance(Context context) {
     @Override
     public void onCreate(SQLiteDatabase db) {
         DeviceLogTable.onCreate(db);
-        HyperLog.i(TAG, "DeviceLogDatabaseHelper onCreate called.");
+        Log.d(TAG, "DeviceLogDatabaseHelper onCreate called.");
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         DeviceLogTable.onUpgrade(db, oldVersion, newVersion);
-        HyperLog.i(TAG, "DeviceLogDatabaseHelper onUpgrade called.");
+        Log.d(TAG, "DeviceLogDatabaseHelper onUpgrade called.");
     }
 
     @Override
diff --git a/hyperlog/src/main/java/com/hypertrack/hyperlog/HyperLog.java b/hyperlog/src/main/java/com/hypertrack/hyperlog/HyperLog.java
diff --git a/hyperlog/src/main/java/com/hypertrack/hyperlog/LogFormat.java b/hyperlog/src/main/java/com/hypertrack/hyperlog/LogFormat.java
diff --git a/hyperlog/src/main/java/com/hypertrack/hyperlog/utils/Utils.java b/hyperlog/src/main/java/com/hypertrack/hyperlog/utils/Utils.java

Original file line number	Diff line number	Diff line change
@@ -43,7 +43,7 @@ The library is available on [`mavenCentral()`](https://dl.bintray.com/piyushgupt
`43`	`43`	```
`44`	`44`	`dependencies {`
`45`	`45`	`...`
`46`		`- compile 'com.hypertrack:hyperlog:0.0.7'`
	`46`	`+ compile 'com.hypertrack:hyperlog:0.0.8'`
`47`	`47`	`...`
`48`	`48`	`}`
`49`	`49`	```
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ class CustomLogMessageFormat extends LogFormat {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`		`- public String getFormattedLogMessage(String logLevelName, String message, String timeStamp,`
	`40`	`+ public String getFormattedLogMessage(String logLevelName, String tag, String message, String timeStamp,`
`41`	`41`	`String senderName, String osVersion, String deviceUUID) {`
`42`		`- String formattedMessage = timeStamp + " : " + logLevelName + " : " + deviceUUID + " : " + message;`
	`42`	`+ String formattedMessage = timeStamp + " : " + logLevelName+"/"+tag + " : " + deviceUUID + " : " + message;`
`43`	`43`	`return formattedMessage;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ public void deleteLogs(View view) {`
`112`	`112`	`HyperLog.deleteLogs();`
`113`	`113`	`logsList.clear();`
`114`	`114`	`listAdapter.notifyDataSetChanged();`
`115`		`-`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`public void nextLog(View view) {`
`@@ -155,6 +154,4 @@ private void showToast(String message) {`
`155`	`154`	`toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);`
`156`	`155`	`toast.show();`
`157`	`156`	`}`
`158`		`-`
`159`		`-`
`160`	`157`	`}`