1 files changed, 46 insertions, 47 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
index dbaa5a7c..e46095e7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
@@ -113,6 +113,7 @@ public class ConversationActivity extends XmppActivity
 	private Message mPendingDownloadableMessage = null;
 
 	private boolean conversationWasSelectedByKeyboard = false;
+    protected boolean mUsingEnterKey = false;
 
 	private View mContentView;
     private View avatarLogoView;
@@ -190,6 +191,7 @@ public class ConversationActivity extends XmppActivity
 				mPendingImageUris.add(Uri.parse(pending));
 			}
 		}
+        this.mUsingEnterKey = ConversationsPlusPreferences.displayEnterKey();
 
 		setContentView(R.layout.fragment_conversations_overview);
 
@@ -337,12 +339,12 @@ public class ConversationActivity extends XmppActivity
 	public void switchToConversation(Conversation conversation) {
 		setSelectedConversation(conversation);
 		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				openConversation();
-			}
-		});
+            @Override
+            public void run() {
+                ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
+                openConversation();
+            }
+        });
 	}
 
 	private void updateActionBarTitle() {
@@ -776,19 +778,19 @@ public class ConversationActivity extends XmppActivity
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
-				new OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-						if (endConversationCheckBox.isChecked()) {
-							endConversation(conversation);
-						} else {
-							updateConversationList();
-							ConversationActivity.this.mConversationFragment.updateMessages();
-						}
-					}
-				});
+                new OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
+                        if (endConversationCheckBox.isChecked()) {
+                            endConversation(conversation);
+                        } else {
+                            updateConversationList();
+                            ConversationActivity.this.mConversationFragment.updateMessages();
+                        }
+                    }
+                });
 		builder.create().show();
 	}
 
@@ -959,24 +961,24 @@ public class ConversationActivity extends XmppActivity
 		builder.setTitle(R.string.disable_notifications);
 		final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
 		builder.setItems(R.array.mute_options_descriptions,
-				new OnClickListener() {
-
-					@Override
-					public void onClick(final DialogInterface dialog, final int which) {
-						final long till;
-						if (durations[which] == -1) {
-							till = Long.MAX_VALUE;
-						} else {
-							till = System.currentTimeMillis() + (durations[which] * 1000);
-						}
-						conversation.setMutedTill(till);
-						ConversationActivity.this.xmppConnectionService.databaseBackend
-								.updateConversation(conversation);
-						updateConversationList();
-						ConversationActivity.this.mConversationFragment.updateMessages();
-						invalidateOptionsMenu();
-					}
-				});
+                new OnClickListener() {
+
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int which) {
+                        final long till;
+                        if (durations[which] == -1) {
+                            till = Long.MAX_VALUE;
+                        } else {
+                            till = System.currentTimeMillis() + (durations[which] * 1000);
+                        }
+                        conversation.setMutedTill(till);
+                        ConversationActivity.this.xmppConnectionService.databaseBackend
+                                .updateConversation(conversation);
+                        updateConversationList();
+                        ConversationActivity.this.mConversationFragment.updateMessages();
+                        invalidateOptionsMenu();
+                    }
+                });
 		builder.create().show();
 	}
 
@@ -1372,10 +1374,6 @@ public class ConversationActivity extends XmppActivity
 			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) {
 				final List<Uri> uris = extractUriFromIntent(data);
 				final Conversation c = getSelectedConversation();
-				final long max = c.getAccount()
-						.getXmppConnection()
-						.getFeatures()
-						.getMaxHttpUploadSize();
 				final OnPresenceSelected callback = new OnPresenceSelected() {
 					@Override
 					public void onPresenceSelected() {
@@ -1389,7 +1387,7 @@ public class ConversationActivity extends XmppActivity
 					}
 				};
 				if (c.getMode() == Conversation.MODE_MULTI
-						|| FileUtils.allFilesUnderSize(this, uris, max)
+						|| FileUtils.allFilesUnderSize(this, uris, getMaxHttpUploadSize(c))
 						|| c.getNextEncryption() == Message.ENCRYPTION_OTR) {
 					callback.onPresenceSelected();
 				} else {
@@ -1433,19 +1431,20 @@ public class ConversationActivity extends XmppActivity
 				mConversationFragment.onActivityResult(requestCode, resultCode, data);
 			}
 			if (requestCode == REQUEST_BATTERY_OP) {
-				setNeverAskForBatteryOptimizationsAgain();
+				// Never Ask For Battery Optimizations Again
+                ConversationsPlusPreferences.commitShowBatteryOptimization(false);
 			}
 		}
 	}
 
-	private void setNeverAskForBatteryOptimizationsAgain() {
-		getPreferences().edit().putBoolean("show_battery_optimization", false).commit();
+	private long getMaxHttpUploadSize(Conversation conversation) {
+		return conversation.getAccount().getXmppConnection().getFeatures().getMaxHttpUploadSize();
 	}
 
 	private void openBatteryOptimizationDialogIfNeeded() {
 		if (hasAccountWithoutPush()
 				&& isOptimizingBattery()
-				&& getPreferences().getBoolean("show_battery_optimization", true)) {
+				&& ConversationsPlusPreferences.showBatteryOptimization()) {
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setTitle(R.string.battery_optimizations_enabled);
 			builder.setMessage(R.string.battery_optimizations_enabled_dialog);
@@ -1462,7 +1461,7 @@ public class ConversationActivity extends XmppActivity
 				builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
 					@Override
 					public void onDismiss(DialogInterface dialog) {
-						setNeverAskForBatteryOptimizationsAgain();
+						ConversationsPlusPreferences.commitShowBatteryOptimization(false);
 					}
 				});
 			}