diff options
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui')
7 files changed, 118 insertions, 27 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java index 4f6cffb4..1b44d09b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java @@ -9,6 +9,7 @@ import java.util.Date; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusColors; +import de.thedevstack.conversationsplus.entities.FileParams; import de.thedevstack.conversationsplus.utils.ui.TextViewUtil; import eu.siacs.conversations.R; @@ -60,10 +61,10 @@ public class MessageDetailsDialog extends AbstractAlertDialog { Logging.d("messagedetailsfile", "File is stored in path: " + message.getRelativeFilePath()); view.findViewById(R.id.dlgMsgDetFileTable).setVisibility(View.VISIBLE); if (null != message.getFileParams()) { - Message.FileParams params = message.getFileParams(); - TextViewUtil.setText(view, R.id.dlgMsgDetFileSize, UIHelper.getHumanReadableFileSize(params.size)); + FileParams params = message.getFileParams(); + TextViewUtil.setText(view, R.id.dlgMsgDetFileSize, UIHelper.getHumanReadableFileSize(params.getSize())); + TextViewUtil.setText(view, R.id.dlgMsgDetFileMimeType, params.getMimeType()); } - TextViewUtil.setText(view, R.id.dlgMsgDetFileMimeType, message.getMimeType()); TextViewUtil.setText(view, R.id.dlgMsgDetFileHttpUploaded, message.isHttpUploaded() ? R.string.cplus_yes : R.string.cplus_no); } diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/SimpleConfirmDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/SimpleConfirmDialog.java new file mode 100644 index 00000000..6bf9c563 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/SimpleConfirmDialog.java @@ -0,0 +1,37 @@ +package de.thedevstack.conversationsplus.ui.dialogs; + +import android.content.Context; +import android.content.DialogInterface; + +import de.thedevstack.conversationsplus.ui.listeners.SimpleUserDecisionCallback; + +import eu.siacs.conversations.R; + +/** + * A dialog to give the user the choice to decide whether to do something or not. + * A UserDecisionListener is used to provide the functionality to be performed by clicking on yes, or no. + */ +public class SimpleConfirmDialog extends AbstractAlertDialog { + protected final SimpleUserDecisionCallback callback; + + public SimpleConfirmDialog(Context context, String title, SimpleUserDecisionCallback userDecisionCallback) { + super(context, title); + this.callback = userDecisionCallback; + this.setPositiveButton(R.string.cplus_ok, new ConfirmOnClickListener()); + this.setNegativeButton(R.string.cancel, null); + } + + public SimpleConfirmDialog(Context context, int titleTextId, SimpleUserDecisionCallback userDecisionCallback) { + super(context, titleTextId); + this.callback = userDecisionCallback; + this.setPositiveButton(R.string.cplus_ok, new ConfirmOnClickListener()); + this.setNegativeButton(R.string.cancel, null); + } + + private class ConfirmOnClickListener implements DialogInterface.OnClickListener { + @Override + public void onClick(DialogInterface dialog, int which) { + callback.onYes(); + } + } +} diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java index c29832a5..3305e8e1 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java @@ -15,13 +15,11 @@ import eu.siacs.conversations.R; * The user also has the choice to save his answer for the future. * A UserDecisionListener is used to provide the functionality to be performed by clicking on yes, or no. */ -public class UserDecisionDialog extends AbstractAlertDialog { - protected final UserDecisionListener listener; +public class UserDecisionDialog extends SimpleConfirmDialog { protected final CheckBox rememberCheckBox; public UserDecisionDialog(Activity context, int questionResourceId, UserDecisionListener userDecisionListener) { - super(context, questionResourceId); - this.listener = userDecisionListener; + super(context, questionResourceId, userDecisionListener); int viewId = R.layout.dialog_userdecision; View view = context.getLayoutInflater().inflate(viewId, null); @@ -36,10 +34,10 @@ public class UserDecisionDialog extends AbstractAlertDialog { public void decide(UserDecision baseDecision) { switch (baseDecision) { case ALWAYS: - this.listener.onYes(); + this.callback.onYes(); break; case NEVER: - this.listener.onNo(); + this.callback.onNo(); break; case ASK: this.show(); @@ -51,9 +49,9 @@ public class UserDecisionDialog extends AbstractAlertDialog { @Override public void onClick(DialogInterface dialog, int which) { - listener.onYes(); + callback.onYes(); if (rememberCheckBox.isChecked()) { - listener.onRemember(UserDecision.ALWAYS); + ((UserDecisionListener)callback).onRemember(UserDecision.ALWAYS); } } } @@ -62,9 +60,9 @@ public class UserDecisionDialog extends AbstractAlertDialog { @Override public void onClick(DialogInterface dialog, int which) { - listener.onNo(); + callback.onNo(); if (rememberCheckBox.isChecked()) { - listener.onRemember(UserDecision.NEVER); + ((UserDecisionListener)callback).onRemember(UserDecision.NEVER); } } } diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java new file mode 100644 index 00000000..222e473b --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/DeleteFileCallback.java @@ -0,0 +1,45 @@ +package de.thedevstack.conversationsplus.ui.listeners; + +import de.thedevstack.conversationsplus.utils.UiUpdateHelper; + +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.entities.TransferablePlaceholder; +import eu.siacs.conversations.persistance.FileBackend; + +/** + * Callback for the user decision if a file should be deleted or not. + */ +public class DeleteFileCallback implements SimpleUserDecisionCallback { + private final Message message; + + public DeleteFileCallback(Message message) { + this.message = message; + } + + /** + * Deletes the file and updates the UI. + */ + private void deleteFile() { + if (FileBackend.deleteFile(this.message)) { + this.message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED)); + UiUpdateHelper.updateConversationUi(); + } + } + + /** + * Deletes the file. + */ + @Override + public void onYes() { + this.deleteFile(); + } + + /** + * Nothing to do in this case. + */ + @Override + public void onNo() { + // Nothing to do + } +} diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java index 0cfee1d8..dec6b885 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java @@ -13,6 +13,8 @@ import java.io.InputStream; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusApplication; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; +import de.thedevstack.conversationsplus.entities.FileParams; +import de.thedevstack.conversationsplus.enums.FileStatus; import de.thedevstack.conversationsplus.enums.UserDecision; import de.thedevstack.conversationsplus.exceptions.UiException; import de.thedevstack.conversationsplus.utils.ImageUtil; @@ -97,20 +99,18 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener { @Override public void onYes() { this.showPrepareFileToast(); - final Message message; - if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) { - message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED); - } else { - message = new Message(conversation, "", conversation.getNextEncryption()); - } - message.setCounterpart(conversation.getNextCounterpart()); - message.setType(Message.TYPE_IMAGE); + final Message message = createMessage(); ConversationsPlusApplication.executeFileAdding(new OnYesRunnable(message, uri)); } @Override public void onNo() { this.showPrepareFileToast(); + final Message message = createMessage(); + ConversationsPlusApplication.executeFileAdding(new OnNoRunnable(message, uri)); + } + + protected Message createMessage() { final Message message; if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) { message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED); @@ -118,8 +118,11 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener { message = new Message(conversation, "", conversation.getNextEncryption()); } message.setCounterpart(conversation.getNextCounterpart()); - message.setType(Message.TYPE_IMAGE); - ConversationsPlusApplication.executeFileAdding(new OnNoRunnable(message, uri)); + //message.setType(Message.TYPE_IMAGE); + message.setFileParams(new FileParams()); + message.getFileParams().setFileStatus(FileStatus.NEEDS_UPLOAD); + + return message; } @Override diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/SimpleUserDecisionCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/SimpleUserDecisionCallback.java new file mode 100644 index 00000000..3ed49c2d --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/SimpleUserDecisionCallback.java @@ -0,0 +1,9 @@ +package de.thedevstack.conversationsplus.ui.listeners; + +/** + * Callback to be executed on a user decision. + */ +public interface SimpleUserDecisionCallback { + void onYes(); + void onNo(); +} diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java index fbee6290..45576225 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/UserDecisionListener.java @@ -3,10 +3,8 @@ package de.thedevstack.conversationsplus.ui.listeners; import de.thedevstack.conversationsplus.enums.UserDecision; /** - * Created by tzur on 31.10.2015. + * Callback to be executed on a user decision with the possibility to remember the decision. */ -public interface UserDecisionListener { - void onYes(); - void onNo(); +public interface UserDecisionListener extends SimpleUserDecisionCallback { void onRemember(UserDecision decision); } |