add loyalty translation and fix few issues

app/build.gradle

@@ -8,13 +8,13 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.remit.jmecustomer"
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 9
-        versionName "0.8"
+        targetSdkVersion 31
+        versionCode 12
+        versionName "0.9"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [fileProvider: "com.remit.jmecustomer.fileprovider"]

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
@@ -42,7 +43,8 @@
             android:name="com.remit.jmecustomer.features.renewId.view.RenewIdActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_RENEW_ID" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -77,7 +79,9 @@
             android:name="com.remit.jmecustomer.features.notice.view.NoticeActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true"
+            >
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_NOTICE" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -179,7 +183,9 @@
             android:name="com.remit.jmecustomer.features.splashscreen.view.SplashScreen"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.Launcher"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden"
+            android:exported="true"
+            >
 
 
             <intent-filter>
@@ -216,7 +222,8 @@
             android:name="com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2Activity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_SENDMONEY" />
@@ -255,7 +262,8 @@
             android:name="com.remit.jmecustomer.features.home.view.HomeActivityV2"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_DASHBOARD" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -298,7 +306,8 @@
             android:name="com.remit.jmecustomer.features.registerv2.newcustomer.view.NewRegisterV2Activity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -325,7 +334,8 @@
             android:name="com.remit.jmecustomer.features.depositinfo.view.DepositInfo"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_HOW_TO_DEPOSIT" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -335,7 +345,8 @@
             android:name="com.remit.jmecustomer.features.mynotifications.view.MyNotificationActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="OPEN_ACTIVITY_NOTIFICATION" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -348,6 +359,12 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden" />
 
+        <activity
+            android:name="com.remit.jmecustomer.features.loyaltypoints.view.LoyaltyPointsActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+
         <service
             android:name="com.remit.jmecustomer.services.JMEFcmMessagingService"
             android:enabled="true"

app/src/main/java/com/remit/jmecustomer/features/home/view/HomeActivityV2.java

@@ -717,7 +717,7 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra
             notificationCountTxtView.setText(RemitApplication.getStorage().getString(PrefKeys.NOTIFICATION_COUNT, ""));
             notificationCountTxtView.setVisibility(View.VISIBLE);
         }
-        //reward_points_value.setText(RemitApplication.getStorage().getString(PrefKeys.REWARD_POINTS, ""));
+        reward_points_value.setText(RemitApplication.getStorage().getString(PrefKeys.REWARD_POINTS, ""));
     }
 }
 

app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java

@@ -41,7 +41,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
 
     private final RecipientAddEditV3GatewayInterface gateway;
     private final CompositeDisposable compositeDisposable;
-    private String TAG=RecipientAddV3ViewModel.class.getSimpleName();
+    private String TAG = RecipientAddV3ViewModel.class.getSimpleName();
 
 
     public RecipientAddV3ViewModel(
@@ -122,7 +122,6 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
     }
 
 
-
     @Override
     public WebRequestModel getWebRequestDataForTermsAndCondition() {
         return new WebRequestModel(getStringfromStringId(R.string.terms_and_condition_title_text), JME_TERMS_N_CONDITIONS, null);
@@ -218,7 +217,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
             receiverLastName = "";
 
         compositeDisposable.add(gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
-                accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
+                        accountType, issuerCode, accountNumber, amount, bankCode, payoutPartner, processId, bankId, receiverCountryId, deliveryMethodID)
                 .doOnSubscribe(disposable -> view.showProgressBar(true, getStringfromStringId(R.string.processing_request_text)))
                 .doFinally(() -> view.showProgressBar(false, ""))
                 .subscribeOn(Schedulers.io())
@@ -334,11 +333,11 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
         @Override
         protected void onSuccess(GenericResponseDataModel<ReceiverInfoV3Model> t) {
             if (t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
-                successMessage = t.getMsg()+" \n "+getStringfromStringId(R.string.recipient_add_success_message_text).replace("xxx", getReceiverName(t.getData()));
+                successMessage = t.getMsg() + " \n " + getStringfromStringId(R.string.recipient_add_success_message_text).replace("xxx", getReceiverName(t.getData()));
                 receiverId=t.getData().getReceiverId();
                 Log.d(TAG, "receiverId "+receiverId);
-                sendMoneyRequiredDataV3=new SendMoneyRequiredDataV3(t.getData());
-              view.showTermsAndConditionScreen();
+                sendMoneyRequiredDataV3 = new SendMoneyRequiredDataV3(t.getData());
+                view.showTermsAndConditionScreen();
             } else {
                 Log.d(TAG, "Failure  ");
                 view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.FAILED, null);
@@ -357,16 +356,16 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
         @Override
         protected void onConnectionNotEstablished(String message) {
             successMessage = null;
-            receiverId=null;
-            sendMoneyRequiredDataV3=null;
+            receiverId = null;
+            sendMoneyRequiredDataV3 = null;
             view.showPopUpMessage(message, CustomAlertDialog.AlertType.NO_INTERNET, null);
         }
 
         @Override
         protected void unauthorizedAccess(String message) {
             successMessage = null;
-            receiverId=null;
-            sendMoneyRequiredDataV3=null;
+            receiverId = null;
+            sendMoneyRequiredDataV3 = null;
             gateway.clearAllUserData();
             view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
         }
@@ -405,16 +404,19 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
             view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
         }
     }
+
     private String getReceiverName(ReceiverInfoV3Model receiverInfoV3Model) {
         String name = "";
-        if (receiverInfoV3Model.getFullName() != null && receiverInfoV3Model.getFullName().length() > 0)
-            name = receiverInfoV3Model.getFullName();
-        else if (receiverInfoV3Model.getFirstName() != null && receiverInfoV3Model.getFirstName().length() > 0)
-            name = receiverInfoV3Model.getFirstName();
-        else if (receiverInfoV3Model.getLocalFullName() != null && receiverInfoV3Model.getLocalFullName().length() > 0)
-            name = receiverInfoV3Model.getLocalFullName();
-        else if (receiverInfoV3Model.getLocalFirstName() != null && receiverInfoV3Model.getLocalFirstName().length() > 0)
-            name = receiverInfoV3Model.getLocalFirstName();
+        if (receiverInfoV3Model != null) {
+            if (receiverInfoV3Model.getFullName() != null && receiverInfoV3Model.getFullName().length() > 0)
+                name = receiverInfoV3Model.getFullName();
+            else if (receiverInfoV3Model.getFirstName() != null && receiverInfoV3Model.getFirstName().length() > 0)
+                name = receiverInfoV3Model.getFirstName();
+            else if (receiverInfoV3Model.getLocalFullName() != null && receiverInfoV3Model.getLocalFullName().length() > 0)
+                name = receiverInfoV3Model.getLocalFullName();
+            else if (receiverInfoV3Model.getLocalFirstName() != null && receiverInfoV3Model.getLocalFirstName().length() > 0)
+                name = receiverInfoV3Model.getLocalFirstName();
+        }
         return name;
     }
 

app/src/main/java/com/remit/jmecustomer/features/sendmoney/model/RewardsPointDTO.java

@@ -12,6 +12,10 @@ public class RewardsPointDTO {
     @Expose
     private String Point;
 
+    @SerializedName("RewardMessage")
+    @Expose
+    private String RewardMessage;
+
     public String getShowRewardPoint() {
         return ShowRewardPoint;
     }
@@ -27,4 +31,12 @@ public class RewardsPointDTO {
     public void setPoint(String point) {
         this.Point = point;
     }
+
+    public String getRewardMessage() {
+        return RewardMessage;
+    }
+
+    public void setRewardMessage(String rewardMessage) {
+        this.RewardMessage = rewardMessage;
+    }
 }

app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java

@@ -590,7 +590,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
         if (rewardsPointDTO.getShowRewardPoint().equalsIgnoreCase("y")) {
             rewardsPointsContainer.setVisibility(View.VISIBLE);
             //pointsAvailableText.setText("You have " + rewardsPointDTO.getPoint() + " reward points available");
-            pointsAvailableText.setText(rewardsPointDTO.getPoint());
+            pointsAvailableText.setText(rewardsPointDTO.getRewardMessage());
             this.rewardPoint = rewardsPointDTO.getPoint();
         }
     }

app/src/main/java/com/remit/jmecustomer/services/JMEFcmMessagingService.java

@@ -43,7 +43,7 @@ public class JMEFcmMessagingService extends FirebaseMessagingService {
         //notificationIntent.setData(Uri.parse(link));
 
         PendingIntent pending = PendingIntent.getActivity(this, 0, notificationIntent,
-                0);
+                PendingIntent.FLAG_IMMUTABLE);
 
         String title = "";
         String body = "";

app/src/main/res/layout/nav_drawer_fragment.xml

@@ -96,7 +96,7 @@
                                 android:layout_marginStart="14dp"
                                 android:layout_marginLeft="10dp"
                                 android:paddingBottom="@dimen/_5sdp"
-                                android:text="1234"
+                                android:text=""
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/_20sdp"
                                 app:txtfontName="@string/semibold" />

app/src/main/res/values-bn/strings.xml

@@ -608,4 +608,8 @@
     <string name="title_referral_text">রেফারেলস</string>
     <string name="rewards_point_placeholder_text">আপনাার গিফট পইন্ট প্রবেশ করান</string>
     <string name="discount_fee_text">ব্যবহৃত গিফট পইন্ট</string>
+
+    <!-- loyalty points -->
+    <string name="loyalty_points_text">লয়্যালিটি পয়েন্ট</string>
+    <string name="loyalty_points_btn_link_text">টাকা পাঠান</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -605,4 +605,8 @@
     <string name="title_referral_text">紹介</string>
     <string name="rewards_point_placeholder_text">獲得ポイントの入力</string>
     <string name="discount_fee_text">使用済み獲得ポイント</string>
+
+    <!-- loyalty points -->
+    <string name="loyalty_points_text">ロイヤリティポイント .</string>
+    <string name="loyalty_points_btn_link_text">"送金する”</string>
 </resources>

app/src/main/res/values-ne/strings.xml

@@ -606,4 +606,8 @@
     <string name="title_referral_text">रेफरलहरु</string>
     <string name="rewards_point_placeholder_text">इनाम अंक लेख्नुहोस्</string>
     <string name="discount_fee_text">छुट शुल्क</string>
+
+    <!-- loyalty points -->
+    <string name="loyalty_points_text">लोयल्त्री पोइन्टस </string>
+    <string name="loyalty_points_btn_link_text">पैसा पठाउनुहोस्</string>
 </resources>

app/src/main/res/values-si/strings.xml

@@ -608,4 +608,8 @@
     <string name="title_referral_text">සම්බන්ධකිරීම්</string>
     <string name="rewards_point_placeholder_text">රිවෝඩ්ස් පොයින්ට්ස් ගණන සටහන් කරන්න</string>
     <string name="discount_fee_text">භාවිතා කල රිවෝඩ්ස් පොයින්ට්ස්</string>
+
+    <!-- loyalty points -->
+    <string name="loyalty_points_text">ලෝයල්ටි පොයින්ට්ස්</string>
+    <string name="loyalty_points_btn_link_text">මුදල් එවන්න</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -605,4 +605,8 @@
     <string name="title_referral_text">Giới thiệu</string>
     <string name="rewards_point_placeholder_text">Nhập điểm thưởng</string>
     <string name="discount_fee_text">Điểm thưởng đã sử dụng</string>
+
+    <!-- loyalty points -->
+    <string name="loyalty_points_text">Điểm thưởng tích lỹ</string>
+    <string name="loyalty_points_btn_link_text">Gửi tiền</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -647,6 +647,6 @@
     <string name="discount_fee_text">Reward Points Used</string>
 
     <!-- loyalty points -->
-    <string name="loyalty_points_text" translatable="false">Loyalty Points</string>
-    <string name="loyalty_points_btn_link_text" translatable="false">Send Money</string>
+    <string name="loyalty_points_text">Loyalty Points</string>
+    <string name="loyalty_points_btn_link_text">Send Money</string>
 </resources><!---->