Compilation errors and merge mixups fixed

1 files changed, 44 insertions, 32 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 1f163b82..4033d71f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1346,14 +1346,49 @@ public class ConversationActivity extends XmppActivity
 
 			}
 		} else {
-			if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
-				mPendingImageUri = null;
-			}
-		}
-	}
+            mPendingImageUris.clear();
+            mPendingFileUris.clear();
+            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();
+        }
+    }
 
 	private void attachLocationToConversation(Conversation conversation, Uri uri) {
-		xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() {
+		xmppConnectionService.attachLocationToConversation(conversation, uri, new UiCallback<Message>() {
 
 			@Override
 			public void success(Message message) {
@@ -1402,28 +1437,9 @@ public class ConversationActivity extends XmppActivity
 		if (conversation == null) {
 			return;
 		}
-		final Toast prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_image), Toast.LENGTH_LONG);
-		prepareFileToast.show();
-		xmppConnectionService.attachImageToConversation(conversation, uri,
-				new UiCallback<Message>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi, Message object) {
-						hidePrepareFileToast(prepareFileToast);
-					}
-
-					@Override
-					public void success(Message message) {
-						hidePrepareFileToast(prepareFileToast);
-						xmppConnectionService.sendMessage(message);
-					}
-
-					@Override
-					public void error(int error, Message message) {
-						hidePrepareFileToast(prepareFileToast);
-						displayErrorDialog(error);
-					}
-				});
+        ResizePictureUserDecisionListener userDecisionListener = new ResizePictureUserDecisionListener(this, conversation, uri, xmppConnectionService);
+        UserDecisionDialog userDecisionDialog = new UserDecisionDialog(this, R.string.userdecision_question_resize_picture, userDecisionListener);
+        userDecisionDialog.decide(ConversationsPlusPreferences.resizePicture());
 	}
 
 	private void hidePrepareFileToast(final Toast prepareFileToast) {
@@ -1483,10 +1499,6 @@ public class ConversationActivity extends XmppActivity
 				});
 	}
 
-	public boolean useSendButtonToIndicateStatus() {
-		return getPreferences().getBoolean("send_button_status", false);
-	}
-
 	public boolean indicateReceived() {
 		return getPreferences().getBoolean("indicate_received", false);
 	}