ask to be excluded from battery optimization

4 files changed, 144 insertions, 73 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 020d3ee7..ca76eb0c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -16,6 +16,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.support.v4.widget.SlidingPaneLayout;
 import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
 import android.util.Log;
@@ -36,6 +37,8 @@ import android.widget.Toast;
 
 import net.java.otr4j.session.SessionStatus;
 
+import org.openintents.openpgp.util.OpenPgpApi;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -61,7 +64,6 @@ import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
-import org.openintents.openpgp.util.OpenPgpApi;
 
 public class ConversationActivity extends XmppActivity
 	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
@@ -200,7 +202,7 @@ public class ConversationActivity extends XmppActivity
 
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View clickedView,
-					int position, long arg3) {
+									int position, long arg3) {
 				if (getSelectedConversation() != conversationList.get(position)) {
 					setSelectedConversation(conversationList.get(position));
 					ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
@@ -288,7 +290,7 @@ public class ConversationActivity extends XmppActivity
 			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
 			mSlidingPaneLayout.setParallaxDistance(150);
 			mSlidingPaneLayout
-				.setShadowResource(R.drawable.es_slidingpane_shadow);
+					.setShadowResource(R.drawable.es_slidingpane_shadow);
 			mSlidingPaneLayout.setSliderFadeColor(0);
 			mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
 
@@ -299,7 +301,7 @@ public class ConversationActivity extends XmppActivity
 					hideKeyboard();
 					if (xmppConnectionServiceBound) {
 						xmppConnectionService.getNotificationService()
-							.setOpenConversation(null);
+								.setOpenConversation(null);
 					}
 					closeContextMenu();
 				}
@@ -442,7 +444,7 @@ public class ConversationActivity extends XmppActivity
 					case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
 						intent.setAction(Intent.ACTION_GET_CONTENT);
 						if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-							intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE,true);
+							intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
 						}
 						intent.setType("image/*");
 						chooser = true;
@@ -509,16 +511,16 @@ public class ConversationActivity extends XmppActivity
 		}
 		switch (attachmentChoice) {
 			case ATTACHMENT_CHOICE_LOCATION:
-				getPreferences().edit().putString("recently_used_quick_action","location").apply();
+				getPreferences().edit().putString("recently_used_quick_action", "location").apply();
 				break;
 			case ATTACHMENT_CHOICE_RECORD_VOICE:
-				getPreferences().edit().putString("recently_used_quick_action","voice").apply();
+				getPreferences().edit().putString("recently_used_quick_action", "voice").apply();
 				break;
 			case ATTACHMENT_CHOICE_TAKE_PHOTO:
-				getPreferences().edit().putString("recently_used_quick_action","photo").apply();
+				getPreferences().edit().putString("recently_used_quick_action", "photo").apply();
 				break;
 			case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
-				getPreferences().edit().putString("recently_used_quick_action","picture").apply();
+				getPreferences().edit().putString("recently_used_quick_action", "picture").apply();
 				break;
 		}
 		final Conversation conversation = getSelectedConversation();
@@ -558,19 +560,19 @@ public class ConversationActivity extends XmppActivity
 					selectPresenceToAttachFile(attachmentChoice, encryption);
 				} else {
 					final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-						.findFragmentByTag("conversation");
+							.findFragmentByTag("conversation");
 					if (fragment != null) {
 						fragment.showNoPGPKeyDialog(false,
 								new OnClickListener() {
 
 									@Override
 									public void onClick(DialogInterface dialog,
-											int which) {
+														int which) {
 										conversation
-											.setNextEncryption(Message.ENCRYPTION_NONE);
+												.setNextEncryption(Message.ENCRYPTION_NONE);
 										xmppConnectionService.databaseBackend
-											.updateConversation(conversation);
-										selectPresenceToAttachFile(attachmentChoice,Message.ENCRYPTION_NONE);
+												.updateConversation(conversation);
+										selectPresenceToAttachFile(attachmentChoice, Message.ENCRYPTION_NONE);
 									}
 								});
 					}
@@ -610,8 +612,8 @@ public class ConversationActivity extends XmppActivity
 					attachFile(requestCode);
 				}
 			} else {
-				Toast.makeText(this,R.string.no_storage_permission,Toast.LENGTH_SHORT).show();
-		}
+				Toast.makeText(this, R.string.no_storage_permission, Toast.LENGTH_SHORT).show();
+			}
 	}
 
 	public void startDownloadable(Message message) {
@@ -622,14 +624,14 @@ public class ConversationActivity extends XmppActivity
 		Transferable transferable = message.getTransferable();
 		if (transferable != null) {
 			if (!transferable.start()) {
-				Toast.makeText(this, R.string.not_connected_try_again,Toast.LENGTH_SHORT).show();
+				Toast.makeText(this, R.string.not_connected_try_again, Toast.LENGTH_SHORT).show();
 			}
 		} else if (message.treatAsDownloadable() != Message.Decision.NEVER) {
 			xmppConnectionService.getHttpConnectionManager().createNewDownloadConnection(message, true);
 		}
 	}
 
-		@Override
+	@Override
 	public boolean onOptionsItemSelected(final MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
 			showConversationsOverview();
@@ -700,9 +702,9 @@ public class ConversationActivity extends XmppActivity
 				this.mConversationFragment.reInit(getSelectedConversation());
 			} else {
 				setSelectedConversation(null);
-				if (mRedirected.compareAndSet(false,true)) {
+				if (mRedirected.compareAndSet(false, true)) {
 					Intent intent = new Intent(this, StartConversationActivity.class);
-					intent.putExtra("init",true);
+					intent.putExtra("init", true);
 					startActivity(intent);
 					finish();
 				}
@@ -717,7 +719,7 @@ public class ConversationActivity extends XmppActivity
 		View dialogView = getLayoutInflater().inflate(
 				R.layout.dialog_clear_history, null);
 		final CheckBox endConversationCheckBox = (CheckBox) dialogView
-			.findViewById(R.id.end_conversation_checkbox);
+				.findViewById(R.id.end_conversation_checkbox);
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
@@ -819,7 +821,7 @@ public class ConversationActivity extends XmppActivity
 		}
 		PopupMenu popup = new PopupMenu(this, menuItemView);
 		final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-			.findFragmentByTag("conversation");
+				.findFragmentByTag("conversation");
 		if (fragment != null) {
 			popup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 
@@ -840,7 +842,7 @@ public class ConversationActivity extends XmppActivity
 									conversation.setNextEncryption(Message.ENCRYPTION_PGP);
 									item.setChecked(true);
 								} else {
-									announcePgp(conversation.getAccount(),conversation);
+									announcePgp(conversation.getAccount(), conversation);
 								}
 							} else {
 								showInstallPgpDialog();
@@ -946,7 +948,7 @@ public class ConversationActivity extends XmppActivity
 		int rotation = getWindowManager().getDefaultDisplay().getRotation();
 		final int upKey;
 		final int downKey;
-		switch(rotation) {
+		switch (rotation) {
 			case Surface.ROTATION_90:
 				upKey = KeyEvent.KEYCODE_DPAD_LEFT;
 				downKey = KeyEvent.KEYCODE_DPAD_RIGHT;
@@ -969,7 +971,8 @@ public class ConversationActivity extends XmppActivity
 			return true;
 		} else if (modifier && key == downKey) {
 			if (isConversationsOverviewHideable() && !isConversationsOverviewVisable()) {
-				showConversationsOverview();;
+				showConversationsOverview();
+				;
 			}
 			return selectDownConversation();
 		} else if (modifier && key == upKey) {
@@ -1105,11 +1108,11 @@ public class ConversationActivity extends XmppActivity
 	public void onSaveInstanceState(final Bundle savedInstanceState) {
 		Conversation conversation = getSelectedConversation();
 		if (conversation != null) {
-			savedInstanceState.putString(STATE_OPEN_CONVERSATION,conversation.getUuid());
+			savedInstanceState.putString(STATE_OPEN_CONVERSATION, conversation.getUuid());
 		} else {
 			savedInstanceState.remove(STATE_OPEN_CONVERSATION);
 		}
-		savedInstanceState.putBoolean(STATE_PANEL_OPEN,isConversationsOverviewVisable());
+		savedInstanceState.putBoolean(STATE_PANEL_OPEN, isConversationsOverviewVisable());
 		if (this.mPendingImageUris.size() >= 1) {
 			savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
 		} else {
@@ -1136,7 +1139,7 @@ public class ConversationActivity extends XmppActivity
 		}
 
 		if (xmppConnectionService.getAccounts().size() == 0) {
-			if (mRedirected.compareAndSet(false,true)) {
+			if (mRedirected.compareAndSet(false, true)) {
 				if (Config.X509_VERIFICATION) {
 					startActivity(new Intent(this, ManageAccountActivity.class));
 				} else {
@@ -1145,9 +1148,9 @@ public class ConversationActivity extends XmppActivity
 				finish();
 			}
 		} else if (conversationList.size() <= 0) {
-			if (mRedirected.compareAndSet(false,true)) {
+			if (mRedirected.compareAndSet(false, true)) {
 				Intent intent = new Intent(this, StartConversationActivity.class);
-				intent.putExtra("init",true);
+				intent.putExtra("init", true);
 				startActivity(intent);
 				finish();
 			}
@@ -1179,7 +1182,7 @@ public class ConversationActivity extends XmppActivity
 			this.onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second);
 		}
 
-		if(!forbidProcessingPendings) {
+		if (!forbidProcessingPendings) {
 			for (Iterator<Uri> i = mPendingImageUris.iterator(); i.hasNext(); i.remove()) {
 				Uri foo = i.next();
 				attachImageToConversation(getSelectedConversation(), foo);
@@ -1196,7 +1199,9 @@ public class ConversationActivity extends XmppActivity
 		}
 		forbidProcessingPendings = false;
 
-		ExceptionHelper.checkForCrash(this, this.xmppConnectionService);
+		if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService)) {
+			openBatteryOptimizationDialogIfNeeded();
+		}
 		setIntent(new Intent());
 	}
 
@@ -1205,14 +1210,14 @@ public class ConversationActivity extends XmppActivity
 		final String downloadUuid = intent.getStringExtra(MESSAGE);
 		final String text = intent.getStringExtra(TEXT);
 		final String nick = intent.getStringExtra(NICK);
-		final boolean pm = intent.getBooleanExtra(PRIVATE_MESSAGE,false);
+		final boolean pm = intent.getBooleanExtra(PRIVATE_MESSAGE, false);
 		if (selectConversationByUuid(uuid)) {
 			this.mConversationFragment.reInit(getSelectedConversation());
 			if (nick != null) {
 				if (pm) {
 					Jid jid = getSelectedConversation().getJid();
 					try {
-						Jid next = Jid.fromParts(jid.getLocalpart(),jid.getDomainpart(),nick);
+						Jid next = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), nick);
 						this.mConversationFragment.privateMessageWith(next);
 					} catch (final InvalidJidException ignored) {
 						//do nothing
@@ -1262,7 +1267,7 @@ public class ConversationActivity extends XmppActivity
 		Uri uri = intent.getData();
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 && uri == null) {
 			ClipData clipData = intent.getClipData();
-			for(int i = 0; i < clipData.getItemCount(); ++i) {
+			for (int i = 0; i < clipData.getItemCount(); ++i) {
 				uris.add(clipData.getItemAt(i).getUri());
 			}
 		} else {
@@ -1272,8 +1277,7 @@ public class ConversationActivity extends XmppActivity
 	}
 
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode,
-			final Intent data) {
+	protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (resultCode == RESULT_OK) {
 			if (requestCode == REQUEST_DECRYPT_PGP) {
@@ -1301,15 +1305,15 @@ public class ConversationActivity extends XmppActivity
 				mPendingImageUris.clear();
 				mPendingImageUris.addAll(extractUriFromIntent(data));
 				if (xmppConnectionServiceBound) {
-					for(Iterator<Uri> i = mPendingImageUris.iterator(); i.hasNext(); i.remove()) {
-						attachImageToConversation(getSelectedConversation(),i.next());
+					for (Iterator<Uri> i = mPendingImageUris.iterator(); i.hasNext(); i.remove()) {
+						attachImageToConversation(getSelectedConversation(), i.next());
 					}
 				}
 			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) {
 				mPendingFileUris.clear();
 				mPendingFileUris.addAll(extractUriFromIntent(data));
 				if (xmppConnectionServiceBound) {
-					for(Iterator<Uri> i = mPendingFileUris.iterator(); i.hasNext(); i.remove()) {
+					for (Iterator<Uri> i = mPendingFileUris.iterator(); i.hasNext(); i.remove()) {
 						attachFileToConversation(getSelectedConversation(), i.next());
 					}
 				}
@@ -1327,9 +1331,9 @@ public class ConversationActivity extends XmppActivity
 					mPendingImageUris.clear();
 				}
 			} else if (requestCode == ATTACHMENT_CHOICE_LOCATION) {
-				double latitude = data.getDoubleExtra("latitude",0);
-				double longitude = data.getDoubleExtra("longitude",0);
-				this.mPendingGeoUri = Uri.parse("geo:"+String.valueOf(latitude)+","+String.valueOf(longitude));
+				double latitude = data.getDoubleExtra("latitude", 0);
+				double longitude = data.getDoubleExtra("longitude", 0);
+				this.mPendingGeoUri = Uri.parse("geo:" + String.valueOf(latitude) + "," + String.valueOf(longitude));
 				if (xmppConnectionServiceBound) {
 					attachLocationToConversation(getSelectedConversation(), mPendingGeoUri);
 					this.mPendingGeoUri = null;
@@ -1344,6 +1348,39 @@ public class ConversationActivity extends XmppActivity
 			if (requestCode == ConversationActivity.REQUEST_DECRYPT_PGP) {
 				mConversationFragment.onActivityResult(requestCode, resultCode, data);
 			}
+			if (requestCode == REQUEST_BATTERY_OP) {
+				setNeverAskForBatteryOptimizationsAgain();
+			}
+		}
+	}
+
+	private void setNeverAskForBatteryOptimizationsAgain() {
+		getPreferences().edit().putBoolean("show_battery_optimization", false).commit();
+	}
+
+	private void openBatteryOptimizationDialogIfNeeded() {
+		if (showBatteryOptimizationWarning() && getPreferences().getBoolean("show_battery_optimization", true)) {
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setTitle(R.string.battery_optimizations_enabled);
+			builder.setMessage(R.string.battery_optimizations_enabled_dialog);
+			builder.setPositiveButton(R.string.next, new OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+					Uri uri = Uri.parse("package:" + getPackageName());
+					intent.setData(uri);
+					startActivityForResult(intent, REQUEST_BATTERY_OP);
+				}
+			});
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+				builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
+					@Override
+					public void onDismiss(DialogInterface dialog) {
+						setNeverAskForBatteryOptimizationsAgain();
+					}
+				});
+			}
+			builder.create().show();
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 01054de1..09958c22 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -5,9 +5,10 @@ import android.app.AlertDialog.Builder;
 import android.app.PendingIntent;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.security.KeyChain;
 import android.security.KeyChainAliasCallback;
 import android.text.Editable;
@@ -52,16 +53,17 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
 public class EditAccountActivity extends XmppActivity implements OnAccountUpdate,
 		OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast {
 
-	private LinearLayout mMainLayout;
 	private AutoCompleteTextView mAccountJid;
 	private EditText mPassword;
 	private EditText mPasswordConfirm;
 	private CheckBox mRegisterNew;
 	private Button mCancelButton;
 	private Button mSaveButton;
+	private Button mDisableBatterOptimizations;
 	private TableLayout mMoreTable;
 
 	private LinearLayout mStats;
+	private RelativeLayout mBatteryOptimizations;
 	private TextView mServerInfoSm;
 	private TextView mServerInfoRosterVersion;
 	private TextView mServerInfoCarbons;
@@ -311,6 +313,14 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		});
 	}
 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == REQUEST_BATTERY_OP) {
+			updateAccountInformation(mAccount == null);
+		}
+	}
+
 	protected void updateSaveButton() {
 		if (accountInfoEdited() && !mInitMode) {
 			this.mSaveButton.setText(R.string.save);
@@ -372,7 +382,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_edit_account);
-		this.mMainLayout = (LinearLayout) findViewById(R.id.account_main_layout);
 		this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid);
 		this.mAccountJid.addTextChangedListener(this.mTextWatcher);
 		this.mAccountJidLabel = (TextView) findViewById(R.id.account_jid_label);
@@ -387,6 +396,17 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mAvatar.setOnClickListener(this.mAvatarClickListener);
 		this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new);
 		this.mStats = (LinearLayout) findViewById(R.id.stats);
+		this.mBatteryOptimizations = (RelativeLayout) findViewById(R.id.battery_optimization);
+		this.mDisableBatterOptimizations = (Button) findViewById(R.id.batt_op_disable);
+		this.mDisableBatterOptimizations.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+				Uri uri = Uri.parse("package:"+getPackageName());
+				intent.setData(uri);
+				startActivityForResult(intent,REQUEST_BATTERY_OP);
+			}
+		});
 		this.mSessionEst = (TextView) findViewById(R.id.session_est);
 		this.mServerInfoRosterVersion = (TextView) findViewById(R.id.server_info_roster_version);
 		this.mServerInfoCarbons = (TextView) findViewById(R.id.server_info_carbons);
@@ -595,6 +615,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		}
 		if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
 			this.mStats.setVisibility(View.VISIBLE);
+			this.mBatteryOptimizations.setVisibility(showBatteryOptimizationWarning() ? View.VISIBLE : View.GONE);
 			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
 					.getLastSessionEstablished()));
 			Features features = this.mAccount.getXmppConnection().getFeatures();
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index a23f51eb..36e82b2a 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -35,6 +35,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.PowerManager;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.text.InputType;
@@ -91,6 +92,7 @@ public abstract class XmppActivity extends Activity {
 	protected static final int REQUEST_ANNOUNCE_PGP = 0x0101;
 	protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
 	protected static final int REQUEST_CHOOSE_PGP_ID = 0x0103;
+	protected static final int REQUEST_BATTERY_OP = 0x13849ff;
 
 	public XmppConnectionService xmppConnectionService;
 	public boolean xmppConnectionServiceBound = false;
@@ -372,6 +374,15 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
+	protected boolean showBatteryOptimizationWarning() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
+			return !pm.isIgnoringBatteryOptimizations(getPackageName());
+		} else {
+			return false;
+		}
+	}
+
 	protected boolean usingEnterKey() {
 		return getPreferences().getBoolean("display_enter_key", false);
 	}
diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
index 0f182847..8799b4a5 100644
--- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
@@ -24,6 +24,7 @@ import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
@@ -35,14 +36,13 @@ public class ExceptionHelper {
 		}
 	}
 
-	public static void checkForCrash(Context context,
-			final XmppConnectionService service) {
+	public static boolean checkForCrash(ConversationActivity activity, final XmppConnectionService service) {
 		try {
 			final SharedPreferences preferences = PreferenceManager
-					.getDefaultSharedPreferences(context);
+					.getDefaultSharedPreferences(activity);
 			boolean neverSend = preferences.getBoolean("never_send", false);
 			if (neverSend) {
-				return;
+				return false;
 			}
 			List<Account> accounts = service.getAccounts();
 			Account account = null;
@@ -53,24 +53,25 @@ public class ExceptionHelper {
 				}
 			}
 			if (account == null) {
-				return;
+				return false;
 			}
 			final Account finalAccount = account;
-			FileInputStream file = context.openFileInput("stacktrace.txt");
+			FileInputStream file = activity.openFileInput("stacktrace.txt");
 			InputStreamReader inputStreamReader = new InputStreamReader(file);
 			BufferedReader stacktrace = new BufferedReader(inputStreamReader);
 			final StringBuilder report = new StringBuilder();
-			PackageManager pm = context.getPackageManager();
+			PackageManager pm = activity.getPackageManager();
 			PackageInfo packageInfo = null;
 			try {
-				packageInfo = pm.getPackageInfo(context.getPackageName(), 0);
+				packageInfo = pm.getPackageInfo(activity.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');
+						+ DateUtils.formatDateTime(activity,
+						packageInfo.lastUpdateTime,
+						DateUtils.FORMAT_SHOW_TIME
+								| DateUtils.FORMAT_SHOW_DATE) + '\n');
 			} catch (NameNotFoundException e) {
+				return false;
 			}
 			String line;
 			while ((line = stacktrace.readLine()) != null) {
@@ -78,11 +79,11 @@ public class ExceptionHelper {
 				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),
+			activity.deleteFile("stacktrace.txt");
+			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			builder.setTitle(activity.getString(R.string.crash_report_title));
+			builder.setMessage(activity.getText(R.string.crash_report_message));
+			builder.setPositiveButton(activity.getText(R.string.send_now),
 					new OnClickListener() {
 
 						@Override
@@ -91,18 +92,18 @@ public class ExceptionHelper {
 							Log.d(Config.LOGTAG, "using account="
 									+ finalAccount.getJid().toBareJid()
 									+ " to send in stack trace");
-                            Conversation conversation = null;
-                            try {
-                                conversation = service.findOrCreateConversation(finalAccount,
-                                        Jid.fromString("bugs@siacs.eu"), false);
-                            } catch (final InvalidJidException ignored) {
-                            }
-                            Message message = new Message(conversation, report
+							Conversation conversation = null;
+							try {
+								conversation = service.findOrCreateConversation(finalAccount,
+										Jid.fromString("bugs@siacs.eu"), false);
+							} catch (final InvalidJidException ignored) {
+							}
+							Message message = new Message(conversation, report
 									.toString(), Message.ENCRYPTION_NONE);
 							service.sendMessage(message);
 						}
 					});
-			builder.setNegativeButton(context.getText(R.string.send_never),
+			builder.setNegativeButton(activity.getText(R.string.send_never),
 					new OnClickListener() {
 
 						@Override
@@ -112,8 +113,9 @@ public class ExceptionHelper {
 						}
 					});
 			builder.create().show();
+			return true;
 		} catch (final IOException ignored) {
-        }
-
+			return false;
+		}
 	}
 }