1 files changed, 61 insertions, 46 deletions

diff --git a/src/eu/siacs/conversations/utils/ExceptionHelper.java b/src/eu/siacs/conversations/utils/ExceptionHelper.java
index 373aadd3..b5fc88bd 100644
--- a/src/eu/siacs/conversations/utils/ExceptionHelper.java
+++ b/src/eu/siacs/conversations/utils/ExceptionHelper.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -26,77 +27,91 @@ import android.util.Log;
 
 public class ExceptionHelper {
 	public static void init(Context context) {
-		if(!(Thread.getDefaultUncaughtExceptionHandler() instanceof ExceptionHandler)) {
-		    Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(context));
+		if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof ExceptionHandler)) {
+			Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(
+					context));
 		}
 	}
-	
-	public static void checkForCrash(Context context, final XmppConnectionService service) {
+
+	public static void checkForCrash(Context context,
+			final XmppConnectionService service) {
 		try {
-			final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-			boolean neverSend = preferences.getBoolean("never_send",false);
+			final SharedPreferences preferences = PreferenceManager
+					.getDefaultSharedPreferences(context);
+			boolean neverSend = preferences.getBoolean("never_send", false);
 			if (neverSend) {
 				return;
 			}
 			List<Account> accounts = service.getAccounts();
 			Account account = null;
-			for(int i = 0; i < accounts.size(); ++i) {
+			for (int i = 0; i < accounts.size(); ++i) {
 				if (!accounts.get(i).isOptionSet(Account.OPTION_DISABLED)) {
 					account = accounts.get(i);
 					break;
 				}
 			}
-			if (account==null) {
+			if (account == null) {
 				return;
 			}
 			final Account finalAccount = account;
 			FileInputStream file = context.openFileInput("stacktrace.txt");
-			InputStreamReader inputStreamReader = new InputStreamReader(
-                    file);
-            BufferedReader stacktrace = new BufferedReader(
-                    inputStreamReader);
-            final StringBuilder report = new StringBuilder();
-            PackageManager pm = context.getPackageManager();
-            PackageInfo packageInfo = null;
-            try {
-                packageInfo = pm.getPackageInfo(context.getPackageName(), 0);
-                report.append("Version: "+packageInfo.versionName+'\n');
-                report.append("Last Update: "+DateUtils.formatDateTime(context, packageInfo.lastUpdateTime, DateUtils.FORMAT_SHOW_TIME|DateUtils.FORMAT_SHOW_DATE)+'\n');
-            } catch (NameNotFoundException e) {}
-            String line;
-            while((line = stacktrace.readLine()) != null) {
-            	report.append(line);
-            	report.append('\n');
-            }
-            file.close();
-            context.deleteFile("stacktrace.txt");
+			InputStreamReader inputStreamReader = new InputStreamReader(file);
+			BufferedReader stacktrace = new BufferedReader(inputStreamReader);
+			final StringBuilder report = new StringBuilder();
+			PackageManager pm = context.getPackageManager();
+			PackageInfo packageInfo = null;
+			try {
+				packageInfo = pm.getPackageInfo(context.getPackageName(), 0);
+				report.append("Version: " + packageInfo.versionName + '\n');
+				report.append("Last Update: "
+						+ DateUtils.formatDateTime(context,
+								packageInfo.lastUpdateTime,
+								DateUtils.FORMAT_SHOW_TIME
+										| DateUtils.FORMAT_SHOW_DATE) + '\n');
+			} catch (NameNotFoundException e) {
+			}
+			String line;
+			while ((line = stacktrace.readLine()) != null) {
+				report.append(line);
+				report.append('\n');
+			}
+			file.close();
+			context.deleteFile("stacktrace.txt");
 			AlertDialog.Builder builder = new AlertDialog.Builder(context);
 			builder.setTitle(context.getString(R.string.crash_report_title));
 			builder.setMessage(context.getText(R.string.crash_report_message));
-			builder.setPositiveButton(context.getText(R.string.send_now), new OnClickListener() {
-				
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					
-						Log.d("xmppService","using account="+finalAccount.getJid()+" to send in stack trace");
-						Conversation conversation = service.findOrCreateConversation(finalAccount, "bugs@siacs.eu", false);
-						Message message = new Message(conversation, report.toString(), Message.ENCRYPTION_NONE);
-						service.sendMessage(message);
-				}
-			});
-			builder.setNegativeButton(context.getText(R.string.send_never),new OnClickListener() {
-				
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					preferences.edit().putBoolean("never_send", true).commit();
-				}
-			});
+			builder.setPositiveButton(context.getText(R.string.send_now),
+					new OnClickListener() {
+
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+
+							Log.d(Config.LOGTAG, "using account="
+									+ finalAccount.getJid()
+									+ " to send in stack trace");
+							Conversation conversation = service
+									.findOrCreateConversation(finalAccount,
+											"bugs@siacs.eu", false);
+							Message message = new Message(conversation, report
+									.toString(), Message.ENCRYPTION_NONE);
+							service.sendMessage(message);
+						}
+					});
+			builder.setNegativeButton(context.getText(R.string.send_never),
+					new OnClickListener() {
+
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							preferences.edit().putBoolean("never_send", true)
+									.commit();
+						}
+					});
 			builder.create().show();
 		} catch (FileNotFoundException e) {
 			return;
 		} catch (IOException e) {
 			return;
 		}
-		
+
 	}
 }