From 7a90ca429bb46fae4cbd600bd4c2274f4a731a16 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 13 Nov 2014 21:04:05 +0100
Subject: basic arbitrary file transfer

---
 src/main/res/values/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 414de73b..e51fbd18 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="add_contact">Add contact</string>
     <string name="send_failed">delivery failed</string>
     <string name="send_rejected">rejected</string>
-    <string name="receiving_image">Receiving image file. Please wait…</string>
+    <string name="receiving_image">Receiving image file (%1$d%%)</string>
     <string name="preparing_image">Preparing image for transmission</string>
     <string name="action_clear_history">Clear history</string>
     <string name="clear_conversation_history">Clear Conversation History</string>
@@ -311,4 +311,8 @@
     <string name="scan_qr_code">Scan QR code</string>
     <string name="show_qr_code">Show QR code</string>
     <string name="account_details">Account details</string>
+    <string name="choose_file">Choose file</string>
+    <string name="receiving_file">Receiving %1$s file (%2$d%%)</string>
+    <string name="download_file">Download %s file</string>
+    <string name="open_file">Open %s file</string>
 </resources>
-- 
cgit v1.2.3


From c7acfe85c379b99c05cef98dbbab6f815b99ed83 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 14 Nov 2014 01:29:56 +0100
Subject: progress for http images as well. fixed open button for sent files

---
 src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e51fbd18..43552aef 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -312,7 +312,8 @@
     <string name="show_qr_code">Show QR code</string>
     <string name="account_details">Account details</string>
     <string name="choose_file">Choose file</string>
-    <string name="receiving_file">Receiving %1$s file (%2$d%%)</string>
+    <string name="receiving_file">Receiving %1$s file (%2$d%% completed)</string>
     <string name="download_file">Download %s file</string>
     <string name="open_file">Open %s file</string>
+    <string name="sending_file">sending (%1$d%% completed)</string>
 </resources>
-- 
cgit v1.2.3


From e7a70a46e0154740177dcdea7fad255dcd4067e9 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 14 Nov 2014 12:31:57 +0100
Subject: some mime and pgp fixes for file transfer

---
 src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 43552aef..c3756673 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -316,4 +316,5 @@
     <string name="download_file">Download %s file</string>
     <string name="open_file">Open %s file</string>
     <string name="sending_file">sending (%1$d%% completed)</string>
+    <string name="preparing_file">Preparing file for transmission</string>
 </resources>
-- 
cgit v1.2.3


From 4ab558715cc279515894d8ad28053716d3d61ad2 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 14 Nov 2014 17:39:03 +0100
Subject: adepted conversationadapter to deal with files

---
 src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c3756673..3b030e16 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -317,4 +317,6 @@
     <string name="open_file">Open %s file</string>
     <string name="sending_file">sending (%1$d%% completed)</string>
     <string name="preparing_file">Preparing file for transmission</string>
+    <string name="file_offered_for_download">File offered for download</string>
+    <string name="file">%s file</string>;
 </resources>
-- 
cgit v1.2.3


From cc4f3702a83b5f4d4d57aa66bf50c5ba3b96e72b Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 15 Nov 2014 12:37:09 +0100
Subject: made file transfers cancelable

---
 src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3b030e16..5a01f8a6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -318,5 +318,6 @@
     <string name="sending_file">sending (%1$d%% completed)</string>
     <string name="preparing_file">Preparing file for transmission</string>
     <string name="file_offered_for_download">File offered for download</string>
-    <string name="file">%s file</string>;
+    <string name="file">%s file</string>
+    <string name="cancel_transmission">Cancel transmission</string>
 </resources>
-- 
cgit v1.2.3


From 47d44448f3c2e4527b23fcabc4ee65269094eda1 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 15 Nov 2014 14:40:43 +0100
Subject: fixed description in notifications and conversation overview

---
 src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5a01f8a6..bf7d35a7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -320,4 +320,6 @@
     <string name="file_offered_for_download">File offered for download</string>
     <string name="file">%s file</string>
     <string name="cancel_transmission">Cancel transmission</string>
+    <string name="file_transmission_failed">file transmission failed</string>
+    <string name="file_deleted">The file has been deleted</string>
 </resources>
-- 
cgit v1.2.3


From 41f7848f2ca48b31ad7fd865490347fe26f60c2b Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 15 Nov 2014 15:16:40 +0100
Subject: handled more error cases

---
 src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bf7d35a7..3d69e0f3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -322,4 +322,5 @@
     <string name="cancel_transmission">Cancel transmission</string>
     <string name="file_transmission_failed">file transmission failed</string>
     <string name="file_deleted">The file has been deleted</string>
+    <string name="no_application_found_to_open_file">No application found to open file</string>
 </resources>
-- 
cgit v1.2.3