Merge branch 'trz/rebase' into trz/rename

5 files changed, 32 insertions, 13 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
index a18fd848..3ca9fce7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
@@ -457,7 +457,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 	private void onOmemoKeyClicked(Account account, String fingerprint) {
 		final XmppAxolotlSession.Trust trust = account.getAxolotlService().getFingerprintTrust(fingerprint);
-		if (trust != null && trust == XmppAxolotlSession.Trust.TRUSTED_X509) {
+		if (Config.X509_VERIFICATION && trust != null && trust == XmppAxolotlSession.Trust.TRUSTED_X509) {
 			X509Certificate x509Certificate = account.getAxolotlService().getFingerprintCertificate(fingerprint);
 			if (x509Certificate != null) {
 				showCertificateInformationDialog(CryptoHelper.extractCertificateInformation(x509Certificate));
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index 1bf95910..5a8bd3db 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -527,6 +527,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		final Message m = this.selectedMessage;
 		final Transferable t = m.getTransferable();
 		if (m.getType() != Message.TYPE_STATUS) {
+			final boolean treatAsFile = m.getType() != Message.TYPE_TEXT
+					&& m.getType() != Message.TYPE_PRIVATE
+					&& t == null;
 			activity.getMenuInflater().inflate(R.menu.message_context, menu);
 			menu.setHeaderTitle(R.string.message_options);
 			MenuItem copyText = menu.findItem(R.id.copy_text);
@@ -536,8 +539,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			MenuItem copyUrl = menu.findItem(R.id.copy_url);
 			MenuItem downloadFile = menu.findItem(R.id.download_file);
 			MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
-			if ((m.getType() == Message.TYPE_TEXT || m.getType() == Message.TYPE_PRIVATE)
-					&& t == null
+			MenuItem deleteFile = menu.findItem(R.id.delete_file);
+			if (!treatAsFile
 					&& !GeoHelper.isGeoUri(m.getBody())
 					&& m.treatAsDownloadable() != Message.Decision.MUST) {
 				copyText.setVisible(true);
@@ -545,11 +548,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
 				retryDecryption.setVisible(true);
 			}
-
-			if ((m.getType() != Message.TYPE_TEXT
-					&& m.getType() != Message.TYPE_PRIVATE
-					&& t == null)
-					|| (GeoHelper.isGeoUri(m.getBody()))) {
+			if (treatAsFile || (GeoHelper.isGeoUri(m.getBody()))) {
 				shareWith.setVisible(true);
 			}
 			if (m.getStatus() == Message.STATUS_SEND_FAILED) {
@@ -571,6 +570,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					|| m.getStatus() == Message.STATUS_OFFERED))) {
 				cancelTransmission.setVisible(true);
 			}
+			if (treatAsFile) {
+				deleteFile.setVisible(true);
+				deleteFile.setTitle(activity.getString(R.string.delete_x_file,UIHelper.getFileDescriptionString(activity, m)));
+			}
 		}
 	}
 
@@ -601,6 +604,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			case R.id.retry_decryption:
 				retryDecryption(selectedMessage);
 				return true;
+			case R.id.delete_file:
+				deleteFile(selectedMessage);
+				return true;
 			default:
 				return super.onContextItemSelected(item);
 		}
@@ -638,12 +644,20 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		}
 	}
 
+	private void deleteFile(Message message) {
+		if (FileBackend.deleteFile(message, activity.xmppConnectionService)) {
+			message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+			activity.xmppConnectionService.updateConversationUi();
+		}
+	}
+
 	private void resendMessage(Message message) {
 		if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
 			DownloadableFile file = FileBackend.getFile(message);
 			if (!file.exists()) {
 				Toast.makeText(activity, R.string.file_deleted, Toast.LENGTH_SHORT).show();
 				message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+				activity.xmppConnectionService.updateConversationUi();
 				return;
 			}
 		}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
index ff7e11d1..35816cff 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
@@ -30,6 +30,8 @@ import de.thedevstack.conversationsplus.services.ExportLogsService;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
+import de.thedevstack.conversationsplus.persistance.FileBackend;
+import de.thedevstack.conversationsplus.services.ExportLogsService;
 import de.thedevstack.conversationsplus.xmpp.XmppConnection;
 import github.ankushsachdeva.emojicon.EmojiconHandler;
 
@@ -184,7 +186,9 @@ public class SettingsActivity extends XmppActivity implements
 			reconnectAccounts();
 		} else if ("parse_emoticons".equals(name)) {
             EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
-        }
+        } else if ("file_transfer_folder".equals(name)) {
+			FileBackend.createNoMedia();
+		}
 
 	}
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
index 8cb71308..3446bfbd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java
@@ -191,7 +191,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 		if (Intent.ACTION_SEND.equals(action)) {
 			final String text = intent.getStringExtra(Intent.EXTRA_TEXT);
 			final Uri uri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-			if (type != null && uri != null && text == null) {
+			if (type != null && uri != null && (text == null || !type.equals("text/plain"))) {
 				this.share.uris.clear();
 				this.share.uris.add(uri);
 				this.share.image = type.startsWith("image/") || isImage(uri);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index e467b5da..fb8aedef 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -738,14 +738,15 @@ public abstract class XmppActivity extends Activity {
 		view.setOnLongClickListener(purge);
 		key.setOnLongClickListener(purge);
 		keyType.setOnLongClickListener(purge);
-		boolean x509 = trust == XmppAxolotlSession.Trust.TRUSTED_X509 || trust == XmppAxolotlSession.Trust.INACTIVE_TRUSTED_X509;
+		boolean x509 = Config.X509_VERIFICATION
+				&& (trust == XmppAxolotlSession.Trust.TRUSTED_X509 || trust == XmppAxolotlSession.Trust.INACTIVE_TRUSTED_X509);
 		switch (trust) {
 			case UNTRUSTED:
 			case TRUSTED:
 			case TRUSTED_X509:
 				trustToggle.setChecked(trust.trusted());
-				trustToggle.setEnabled(trust != XmppAxolotlSession.Trust.TRUSTED_X509);
-				if (trust == XmppAxolotlSession.Trust.TRUSTED_X509) {
+				trustToggle.setEnabled(!Config.X509_VERIFICATION || trust != XmppAxolotlSession.Trust.TRUSTED_X509);
+				if (Config.X509_VERIFICATION && trust == XmppAxolotlSession.Trust.TRUSTED_X509) {
 					trustToggle.setOnClickListener(null);
 				}
 				key.setTextColor(getPrimaryTextColor());