[3.9.2-dev] Add persistent debug logging.

app/build.gradle

@@ -159,11 +159,13 @@ dependencies {
     //implementation 'com.github.wulkanowy:uonet-request-signer:master-SNAPSHOT'
     //implementation 'com.github.kuba2k2.uonet-request-signer:android:master-63f094b14a-1'
 
-    implementation "org.redundent:kotlin-xml-builder:1.5.3"
+    //implementation "org.redundent:kotlin-xml-builder:1.5.3"
 
     implementation "io.github.wulkanowy:signer-android:0.1.1"
 
     implementation "androidx.work:work-runtime-ktx:${versions.work}"
+
+    implementation 'com.hypertrack:hyperlog:0.0.10'
 }
 repositories {
     mavenCentral()

app/src/main/java/pl/szczodrzynski/edziennik/App.java

@@ -36,6 +36,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+import com.hypertrack.hyperlog.HyperLog;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
@@ -81,6 +82,7 @@ import pl.szczodrzynski.edziennik.network.NetworkUtils;
 import pl.szczodrzynski.edziennik.network.TLSSocketFactory;
 import pl.szczodrzynski.edziennik.sync.SyncWorker;
 import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity;
+import pl.szczodrzynski.edziennik.utils.DebugLogFormat;
 import pl.szczodrzynski.edziennik.utils.PermissionChecker;
 import pl.szczodrzynski.edziennik.utils.Themes;
 import pl.szczodrzynski.edziennik.utils.Utils;
@@ -294,6 +296,10 @@ public class App extends androidx.multidex.MultiDexApplication implements Config
         }
 
         if (App.devMode || BuildConfig.DEBUG) {
+            HyperLog.initialize(this);
+            HyperLog.setLogLevel(Log.VERBOSE);
+            HyperLog.setLogFormat(new DebugLogFormat(this));
+
             ChuckerCollector chuckerCollector = new ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR);
             ChuckerInterceptor chuckerInterceptor = new ChuckerInterceptor(this, chuckerCollector);
             httpBuilder.addInterceptor(chuckerInterceptor);

app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusMessages.kt

@@ -12,13 +12,17 @@ import okhttp3.Cookie
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.parser.Parser
-import org.redundent.kotlin.xml.PrintOptions
-import org.redundent.kotlin.xml.xml
 import pl.szczodrzynski.edziennik.api.v2.*
 import pl.szczodrzynski.edziennik.api.v2.librus.DataLibrus
 import pl.szczodrzynski.edziennik.api.v2.models.ApiError
 import pl.szczodrzynski.edziennik.get
 import pl.szczodrzynski.edziennik.utils.Utils.d
+import java.io.StringWriter
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
 
 open class LibrusMessages(open val data: DataLibrus) {
     companion object {
@@ -80,7 +84,27 @@ open class LibrusMessages(open val data: DataLibrus) {
                         .secure().httpOnly().build()
         ))
 
-        val requestXml = xml("service") {
+
+        val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+        val doc = docBuilder.newDocument()
+        val serviceElement = doc.createElement("service")
+        val headerElement = doc.createElement("header")
+        val dataElement = doc.createElement("data")
+        for ((key, value) in parameters.orEmpty()) {
+            val element = doc.createElement(key)
+            element.appendChild(doc.createTextNode(value.toString()))
+            dataElement.appendChild(element)
+        }
+        serviceElement.appendChild(headerElement)
+        serviceElement.appendChild(dataElement)
+        doc.appendChild(serviceElement)
+        val transformer = TransformerFactory.newInstance().newTransformer()
+        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
+        val stringWriter = StringWriter()
+        transformer.transform(DOMSource(doc), StreamResult(stringWriter))
+        val requestXml = stringWriter.toString()
+
+        /*val requestXml = xml("service") {
             "header" { }
             "data" {
                 for ((key, value) in parameters.orEmpty()) {
@@ -92,7 +116,7 @@ open class LibrusMessages(open val data: DataLibrus) {
         }.toString(PrintOptions(
                 singleLineTextElements = true,
                 useSelfClosingTags = true
-        ))
+        ))*/
 
         Request.builder()
                 .url("$LIBRUS_MESSAGES_URL/$endpoint")

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/home/HomeFragment.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
@@ -31,11 +32,13 @@ import androidx.work.WorkManager;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.chuckerteam.chucker.api.Chucker;
+import com.hypertrack.hyperlog.HyperLog;
 import com.mikepenz.iconics.IconicsColor;
 import com.mikepenz.iconics.IconicsDrawable;
 import com.mikepenz.iconics.IconicsSize;
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -114,6 +117,19 @@ public class HomeFragment extends Fragment {
             startActivity(new Intent(activity, LoginLibrusCaptchaActivity.class));
         }));
 
+        b.getLogs.setOnClickListener((v -> {
+            File logs = HyperLog.getDeviceLogsInFile(activity, true);
+            Intent intent = new Intent(Intent.ACTION_SEND);
+
+            if(logs.exists()) {
+                intent.setType("text/plain");
+                intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+logs.getAbsolutePath()));
+                intent.putExtra(Intent.EXTRA_SUBJECT, "Share debug logs");
+                intent.putExtra(Intent.EXTRA_TEXT, "Share debug logs");
+                startActivity(Intent.createChooser(intent, "Share debug logs"));
+            }
+        }));
+
         //((TextView)v.findViewById(R.id.nextSync)).setText(getString(R.string.next_sync_format,Time.fromMillis(app.appJobs.syncJobTime).getStringHMS()));
 
 

app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/settings/SettingsNewFragment.java

@@ -533,7 +533,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
             syncCardIntervalItem.setChecked(app.appConfig.registerSyncEnabled);
             syncCardIntervalItem.setOnClickAction(() -> {
                 List<CharSequence> intervalNames = new ArrayList<>();
-                if (App.devMode) {
+                if (App.devMode && false) {
                     intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_seconds, 30));
                     intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_minutes, 2));
                 }
@@ -545,7 +545,7 @@ public class SettingsNewFragment extends MaterialAboutFragment {
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_hours, 3));
                 intervalNames.add(HomeFragment.plural(activity, R.plurals.time_till_hours, 4));
                 List<Integer> intervals = new ArrayList<>();
-                if (App.devMode) {
+                if (App.devMode && false) {
                     intervals.add(30);
                     intervals.add(2 * 60);
                 }

app/src/main/java/pl/szczodrzynski/edziennik/utils/DebugLogFormat.kt

@@ -0,0 +1,10 @@
+package pl.szczodrzynski.edziennik.utils
+
+import android.content.Context
+import com.hypertrack.hyperlog.LogFormat
+
+class DebugLogFormat(context: Context) : LogFormat(context) {
+    override fun getFormattedLogMessage(logLevelName: String?, tag: String?, message: String?, timeStamp: String?, senderName: String?, osVersion: String?, deviceUUID: String?): String {
+        return "${timeStamp?.replace("[TZ]".toRegex(), " ")}D/$tag: $message"
+    }
+}

app/src/main/java/pl/szczodrzynski/edziennik/utils/Utils.java

@@ -26,6 +26,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 
+import com.hypertrack.hyperlog.HyperLog;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -106,15 +108,15 @@ public class Utils {
 
     public static void d(String TAG, String message) {
         if (App.devMode) {
-            Log.d("Szkolny/"+TAG, message);
+            HyperLog.d("Szkolny/"+TAG, message);
             //debugLog.add(TAG+": "+message);
         }
     }
     public static void c(String TAG, String message) {
-        if (App.devMode) {
+        /*if (App.devMode) {
             Log.d(TAG, "// " + message);
             ///debugLog.add(TAG+": // "+message);
-        }
+        }*/
     }
 
     /**

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

@@ -39,6 +39,14 @@
                 tools:visibility="visible"
                 tools:ignore="HardcodedText">
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/getLogs"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:text="Save Debug Logs" />
+
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/librusCaptchaButton"
                     style="@style/Widget.MaterialComponents.Button"

build.gradle

@@ -5,8 +5,8 @@ buildscript {
         kotlin_version = '1.3.50'
 
         release = [
-                versionName: "3.9.0-dev",
-                versionCode: 3090000
+                versionName: "3.9.2-dev",
+                versionCode: 3090200
         ]
 
         setup = [