From eb4770ccfa819c8fb6f762c1954f883e51230c87 Mon Sep 17 00:00:00 2001
From: Aditya-Sood <sood.aditya.08@gmail.com>
Date: Tue, 2 Jul 2019 00:33:26 +0530
Subject: [PATCH] Fix bug due to string extraction

Added space for compound messages
---
 .../local_file_transfer/DeviceListFragment.java        |  2 +-
 .../local_file_transfer/LocalFileTransferActivity.java | 10 +++++-----
 .../local_file_transfer/SenderDeviceAsyncTask.java     |  2 +-
 app/src/main/res/values/strings.xml                    |  7 ++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
index 420491d25..ce5175d2a 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java
@@ -116,7 +116,7 @@ public class DeviceListFragment extends ListFragment implements WifiP2pManager.P
 
     selectedPeerDevice = (WifiP2pDevice) getListAdapter().getItem(position);
     new AlertDialog.Builder(localFileTransferActivity)
-        .setMessage(getString(R.string.transfer_to) + selectedPeerDevice.deviceName + "?")
+        .setMessage(getString(R.string.transfer_to) + " " + selectedPeerDevice.deviceName + "?")
         .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
index 7dcd4ed7f..2ea3b548d 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java
@@ -159,7 +159,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
 
         @Override
         public void onFailure(int reason) {
-          showToast(LocalFileTransferActivity.this, LocalFileTransferActivity.this.getString(R.string.discovery_failed) + getErrorMessage(reason), Toast.LENGTH_SHORT);
+          showToast(LocalFileTransferActivity.this, LocalFileTransferActivity.this.getString(R.string.discovery_failed) + " " + getErrorMessage(reason), Toast.LENGTH_SHORT);
         }
       });
       return true;
@@ -203,7 +203,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
       case WifiP2pManager.BUSY:            return getString(R.string.wifi_p2p_framework_busy);
       case WifiP2pManager.P2P_UNSUPPORTED: return getString(R.string.wifi_p2p_unsupported);
 
-      default: return (getString(R.string.wifi_p2p_unknown_error) + reason);
+      default: return (getString(R.string.wifi_p2p_unknown_error) + " " + reason);
     }
   }
 
@@ -271,7 +271,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
           @Override
           public void onFailure(int reasonCode) {
             showToast(LocalFileTransferActivity.this,
-                getString(R.string.abort_failed) + getErrorMessage(reasonCode),
+                getString(R.string.abort_failed) + " " + getErrorMessage(reasonCode),
                 Toast.LENGTH_SHORT);
           }
         });
@@ -293,7 +293,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
 
       @Override
       public void onFailure(int reason) {
-        showToast(LocalFileTransferActivity.this, getString(R.string.connection_failed) + getErrorMessage(reason), Toast.LENGTH_LONG);
+        showToast(LocalFileTransferActivity.this, getString(R.string.connection_failed) + " " + getErrorMessage(reason), Toast.LENGTH_LONG);
       }
     });
   }
@@ -310,7 +310,7 @@ public class LocalFileTransferActivity extends AppCompatActivity implements Wifi
 
       @Override
       public void onFailure(int reasonCode) {
-        Log.d(TAG, "Disconnect failed. Reason :" + reasonCode);
+        Log.d(TAG, "Disconnect failed. Reason: " + reasonCode);
       }
 
       @Override
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
index 0ea55c856..5b622abb2 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
@@ -100,7 +100,7 @@ class SenderDeviceAsyncTask extends AsyncTask<Uri, Void, Boolean> {
       transferProgressFragment.changeStatus(fileItemIndex, FileItem.SENT);
     } else {
       Activity activity = deviceListFragment.getActivity();
-      showToast(activity, activity.getString(R.string.error_sending) + getFileName(deviceListFragment.getFileUriList().get(fileItemIndex)), Toast.LENGTH_SHORT);
+      showToast(activity, activity.getString(R.string.error_sending) + " " + getFileName(deviceListFragment.getFileUriList().get(fileItemIndex)), Toast.LENGTH_SHORT);
       transferProgressFragment.changeStatus(fileItemIndex, FileItem.ERROR);
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68a4bab0c..613a5b0c7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -245,9 +245,6 @@
   <string name="switch_tabs">Switch tabs</string>
   <string name="smiling_face">:D</string>
   <string name="close_all_tabs">Close all tabs</string>
-
-  <!-- TODO: Remove or change this placeholder text -->
-  <string name="hello_blank_fragment">Hello blank fragment</string>
   <string name="discovery_initiated">Discovery Initiated</string>
   <string name="discovery_failed">Discovery Failed:</string>
   <string name="wifi_p2p_internal_error">Internal error</string>
@@ -257,7 +254,7 @@
   <string name="channel_lost">Channel lost, trying again</string>
   <string name="severe_loss_error">Severe! Try Disable/Re-enable WiFi P2P</string>
   <string name="abort_connection">Aborting connection</string>
-  <string name="abort_failed">Connect abort request failed. Reason :</string>
+  <string name="abort_failed">Connect abort request failed. Reason:</string>
   <string name="connection_failed">Connection failed:</string>
   <string name="permission_rationale_location">Location permission is required by Android to allow the app to detect peer devices</string>
   <string name="permission_rationale_storage">Storage permissions required for accessing and storing ZIM files</string>
@@ -291,7 +288,7 @@
   <string name="device_status">Device Status</string>
   <string name="your_device">Your Device:</string>
   <string name="nearby_devices">NEARBY DEVICES</string>
-  <string name="no_devices_found">No devices detected Tap on search button to try again</string>
+  <string name="no_devices_found">No devices detected. Tap on search button to try again</string>
   <string name="files_for_transfer">FILES FOR TRANSFER</string>
   <string name="file_name">File Name</string>
 </resources>