From b638c2584b794c1c6f12136ec6d1adcbca762910 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Fri, 21 Jul 2017 14:08:50 +0200
Subject: [PATCH] Improve debug info

---
 .../davdroid/ui/DebugInfoActivity.java        | 27 +++++++++++++++++++
 dav4android                                   |  2 +-
 scripts/adb-log.sh                            |  3 +++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100755 scripts/adb-log.sh

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
index 0304a2a0..f4147c47 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.java
@@ -20,6 +20,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.ProxyInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
@@ -222,6 +225,30 @@ public class DebugInfoActivity extends AppCompatActivity implements LoaderManage
                 App.log.log(Level.SEVERE, "Couldn't get software information", ex);
             }
 
+            report.append("CONNECTIVITY (at the moment)\n");
+            ConnectivityManager cm = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            report.append("Active connection: ");
+            NetworkInfo networkInfo = cm.getActiveNetworkInfo();
+            if (networkInfo != null) {
+                String type;
+                switch (networkInfo.getType()) {
+                    case ConnectivityManager.TYPE_WIFI: type = "WiFI"; break;
+                    case ConnectivityManager.TYPE_MOBILE: type = "mobile"; break;
+                    default: type = "type: " + String.valueOf(networkInfo.getType());
+                }
+                report  .append(type).append(", ")
+                        .append(networkInfo.getDetailedState().toString());
+            } else
+                report.append("none");
+            report.append("\n");
+            if (Build.VERSION.SDK_INT >= 23) {
+                ProxyInfo proxy = cm.getDefaultProxy();
+                report  .append("System default proxy: ")
+                        .append(proxy == null ? "none" : proxy.getHost()+":"+proxy.getPort())
+                        .append("\n");
+            }
+            report.append("\n");
+
             report.append("CONFIGURATION\n");
             // power saving
             PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
diff --git a/dav4android b/dav4android
index f140ee2e..4b136453 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit f140ee2ebc6cd075a16e0f704673e288a47b2a0d
+Subproject commit 4b136453631ae7d0fe8666d2aa5d7196969ef249
diff --git a/scripts/adb-log.sh b/scripts/adb-log.sh
new file mode 100755
index 00000000..e57b16e9
--- /dev/null
+++ b/scripts/adb-log.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+adb shell setprop log.tag.davdroid VERBOSE
+adb shell setprop log.tag.dav4android VERBOSE