Handle uncaught exceptions

ma1co · Apr 25, 2016 · c1fcf3e · c1fcf3e
1 parent 983cf0d
commit c1fcf3e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/ma1co/openmemories/tweak/Logger.java b/app/src/main/java/com/github/ma1co/openmemories/tweak/Logger.java
@@ -1,5 +1,8 @@
 package com.github.ma1co.openmemories.tweak;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 public class Logger {
     private static final StringBuffer buffer = new StringBuffer();
 
@@ -23,11 +26,17 @@ public static void error(String tag, String msg) {
         log("ERROR", tag, msg);
     }
 
-    public static void error(String tag, String msg, Exception exp) {
-        error(tag, (msg.isEmpty() ? "" : msg + ": ") + exp.getClass().getSimpleName() + " (" + exp.getMessage() + ")");
+    public static void error(String tag, String msg, Throwable exp) {
+        StringWriter sw = new StringWriter();
+        if (!msg.isEmpty()) {
+            sw.append(msg);
+            sw.append(": ");
+        }
+        exp.printStackTrace(new PrintWriter(sw));
+        error(tag, sw.toString().trim());
     }
 
-    public static void error(String tag, Exception exp) {
+    public static void error(String tag, Throwable exp) {
         error(tag, "", exp);
     }
 }
diff --git a/app/src/main/java/com/github/ma1co/openmemories/tweak/MainActivity.java b/app/src/main/java/com/github/ma1co/openmemories/tweak/MainActivity.java
@@ -15,6 +15,16 @@ public class MainActivity extends TabActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(Thread thread, Throwable exp) {
+                Logger.error("UncaughtExceptionHandler", exp);
+                saveLog();
+                System.exit(0);
+            }
+        });
+
         addTab("video", "Video", android.R.drawable.ic_menu_camera, VideoActivity.class);
         addTab("lang", "Languages", android.R.drawable.ic_menu_mapmode, LanguageActivity.class);
         addTab("protection", "Protection", android.R.drawable.ic_lock_lock, ProtectionActivity.class);
@@ -37,6 +47,10 @@ protected void onResume() {
     protected void onPause() {
         super.onPause();
         Logger.info("MainActivity", "application end");
+        saveLog();
+    }
+
+    protected void saveLog() {
         try {
             FileWriter writer = new FileWriter(LOG_FILE, true);
             writer.write(Logger.getLogs() + "\n");