From ebf5ead9a87d1ee771d51868ebf21e665f2fb3b8 Mon Sep 17 00:00:00 2001
From: preyearegmi <preyearegmi@outlook.com>
Date: Thu, 21 Mar 2019 09:58:58 +0900
Subject: [PATCH] Locale fixes for transaction password prompt activity

---
 .../TransactionPasswordPromptV2Presenter.java  |  3 ++-
 .../TransactionPasswordPromptActivity.java     | 18 ++----------------
 app/src/main/res/values/strings.xml            |  3 ++-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java
index 14537083..67da4fe1 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/presenter/TransactionPasswordPromptV2Presenter.java
@@ -1,5 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.transactionpasspromt.presenter;
 
+import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.transactionpasspromt.gateway.TransactionPasswordPromptV2Gateway;
@@ -32,7 +33,7 @@ public class TransactionPasswordPromptV2Presenter extends BasePresenter implemen
     public void getOtp() {
         this.compositeDisposable.add(
           this.gateway.requestOtp(this.gateway.getAuth(),this.gateway.getUserID())
-                  .doOnSubscribe(disposable -> view.showProgressBar(true, "Requesting OTP..."))
+                  .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.requesting_otp_text)))
                   .doFinally(() -> view.showProgressBar(false, ""))
                   .subscribeOn(Schedulers.io())
                   .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
index 826b29bc..1c784145 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionpasspromt/view/TransactionPasswordPromptActivity.java
@@ -217,11 +217,11 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S
                 String timeRemaining = String.format(Locale.US, "%02d", minutes)
                         + ":" + String.format(Locale.US, "%02d", seconds);
 
-                Spannable tryInText = new SpannableString("Try again in ");
+                Spannable tryInText = new SpannableString(getString(R.string.resend_code_text));
                 tryInText.setSpan(new ForegroundColorSpan(grayColor), 0, tryInText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 resendRequest.setText(tryInText);
 
-                Spannable timeText = new SpannableString(timeRemaining);
+                Spannable timeText = new SpannableString(" "+timeRemaining);
                 timeText.setSpan(new ForegroundColorSpan(redColor), 0, timeText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
                 resendRequest.append(timeText);
@@ -292,20 +292,6 @@ public class TransactionPasswordPromptActivity extends BaseActivity implements S
 
         }
 
-
-        private String getDecryptedDataFromIntent(Intent intent) {
-            if (intent == null)
-                return "";
-
-            String cipherData = intent.getStringExtra(TransKeyActivity.mTK_PARAM_CIPHER_DATA);
-
-            byte[] secureKey = intent.getByteArrayExtra(TransKeyActivity.mTK_PARAM_SECURE_KEY);
-            int iRealDataLength = intent.getIntExtra(TransKeyActivity.mTK_PARAM_DATA_LENGTH, 0);
-            Log.d("EncryptedData", cipherData);
-            return EncryptionManager.decryptCipherText(cipherData, secureKey, iRealDataLength);
-        }
-
-
         @Override
         public void input(int i) {
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 360198b0..ad016bc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -444,7 +444,7 @@
 
 
     <string name="language_text">Language</string>
-    <string name="resend_money_text">Resend</string>
+    <string name="resend_money_text">Resend Money</string>
     <string name="support_description_text">We are always there to help you.</string>
     <string name="your_request_text">Your request here</string>
     <string name="request_for_cancellation_text">Request for cancellation</string>
@@ -457,6 +457,7 @@
     <string name="subject_text">Subject</string>
     <string name="account_no_validation_error_text">Invalid account number (Only numbers and alphabets allowed)</string>
     <string name="resend_search_hint_text">GME No / Receiver Name / Bank Name</string>
+    <string name="resend_code_text">Try again in </string>
 
 
 </resources>