From b1ab7347b92329512bebe57f6624cae33c27036f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 29 May 2016 20:33:36 +0200
Subject: FileTransfer reworked (first steps - functionality as is), HttpUpload
 separated, some bugfixes - HttpUpload moved into own package - FileTransfer
 managed by a central manager class, several   FileTransferService
 implementation can be used   - Security initializations moved to
 ConversationsPlusApplication   - Access to PowerManager moved to
 ConversationsPlusApplication   - Removed unused code fragments   - Access to
 HttpConnectionManager is now static

---
 .../HttpUploadedFileEncryptionUiCallback.java      | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java

(limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java
new file mode 100644
index 00000000..25a16d78
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java
@@ -0,0 +1,33 @@
+package de.thedevstack.conversationsplus.services.filetransfer.httpupload;
+
+import android.app.PendingIntent;
+
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.ui.UiCallback;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
+
+/**
+ *
+ */
+public class HttpUploadedFileEncryptionUiCallback implements UiCallback<Message> {
+    private final HttpFileTransferEntity entity;
+
+    public HttpUploadedFileEncryptionUiCallback(HttpFileTransferEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public void success(Message message) {
+        XmppConnectionServiceAccessor.xmppConnectionService.resendMessage(message, this.entity.isDelayed());
+    }
+
+    @Override
+    public void error(int errorCode, Message object) {
+        this.entity.fail();
+    }
+
+    @Override
+    public void userInputRequried(PendingIntent pi, Message object) {
+        this.entity.fail();
+    }
+}
-- 
cgit v1.2.3


From f45ad10b1baaf09fd4a40d6b63d1cd093623eedc Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 6 Jun 2016 09:05:50 +0200
Subject: Related to FS#131, FS#129, FS#220: - FileTransferFailureReason
 including types introduced. A failure can be recoverable, non-recoverable or
 limited recoverable - in case file transfer with the highest weight factor
 fails, the next file transfer method is used - improved logging - javadoc
 comments added

---
 .../httpupload/HttpUploadedFileEncryptionUiCallback.java             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java
index 25a16d78..e3935252 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/httpupload/HttpUploadedFileEncryptionUiCallback.java
@@ -3,6 +3,7 @@ package de.thedevstack.conversationsplus.services.filetransfer.httpupload;
 import android.app.PendingIntent;
 
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.services.filetransfer.FileTransferFailureReason;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 
@@ -23,11 +24,11 @@ public class HttpUploadedFileEncryptionUiCallback implements UiCallback<Message>
 
     @Override
     public void error(int errorCode, Message object) {
-        this.entity.fail();
+        this.entity.fail(FileTransferFailureReason.createLimitedRecoverableFailureReason("Failed to encrypt"));
     }
 
     @Override
     public void userInputRequried(PendingIntent pi, Message object) {
-        this.entity.fail();
+        this.entity.fail(FileTransferFailureReason.createLimitedRecoverableFailureReason("Failed to encrypt, user input would have been required"));
     }
 }
-- 
cgit v1.2.3