update balance library mandiri and bni

app/build.gradle

 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 28
     buildToolsVersion "30.0.1"
 
     defaultConfig {
         applicationId "id.mdd.implementationpartnerconnect"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -29,34 +29,39 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.preference:preference:1.1.1"
+    implementation "androidx.preference:preference:1.1.0"
+    implementation 'com.google.android.material:material:1.1.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.54'
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation fileTree(include: ['*.aar'], dir: 'libs')
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
+
+    //retrofit
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
+//    implementation project(path: ':mdd-service-release')
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
 
     implementation 'com.jakewharton:butterknife:10.2.0'
     implementation 'com.bugfender.sdk:android:3.+'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
+    implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '2.0.5', ext: 'aar')
 
-    annotationProcessor "androidx.room:room-compiler:2.2.5"
-    implementation 'androidx.core:core:1.3.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-    implementation(group: 'com.mdd.payment', name: 'aar-deviceid-release', version: '2.0.4', ext: 'aar')
-
-    implementation(group: 'com.mdd.service', name: 'partner-connect', version: '2.2.7', ext: 'aar')
-    implementation(group: 'com.mdd.payment', name: 'mybanklibrary-release', version: '3.5.9', ext: 'aar')
-    implementation(group: 'com.mdd.topup', name: 'update-balance', version: '2.4.7', ext: 'aar')
+    implementation(group: 'com.mdd.service', name: 'partner-connect', version: '2.3.4', ext: 'aar')
+    implementation(group: 'com.mdd.payment', name: 'mybanklibrary-release', version: '3.6.4', ext: 'aar')
+    implementation(group: 'com.mdd.topup', name: 'update-balance', version: '2.8.5', ext: 'aar')
     implementation(group: 'com.mdd.payment', name: 'z91library-release', version: '2.1.0', ext: 'aar')
     implementation(group: 'com.mdd.payment', name: 'organicdrv-release', version: '2.1.0', ext: 'aar')
     implementation(group: 'com.mdd.payment', name: 'wepoylibrary-release', version: '2.2.0', ext: 'aar')

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">

app/src/main/java/id/mdd/implementationpartnerconnect/MainActivity.java

@@ -19,6 +19,8 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Message;
 import android.os.StrictMode;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -36,6 +38,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
+import com.mdd.topupUnik.ubal.ApiUtils;
 import com.mdd.topupUnik.ubal.InitReader;
 import com.mdd.topupUnik.ubal.MainCardProcessor;
 import com.mdd.topupUnik.ubal.ReversalObject;
@@ -193,8 +196,12 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
             onTagDiscovered(tagFromIntent);
         }
 
+        String imei = Settings.Secure.getString(getContentResolver(), "android_id");
+        Log.e("imei", imei);
+
     }
 
+
     private void hideResult() {
         mOpsResult.setVisibility(View.GONE);
     }
@@ -481,7 +488,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
                 public void onErrorNfcCardMsg(int errorCode) {
                     runOnUiThread(() -> MainActivity.this.onUpdateBalanceError(""));
                 }
-            });
+            }, ApiUtils.prod_environment);
             cardProcessor.lockIsoDepCard(tag);
             String cardUid = ByteArrayToHexString(tag.getId());
             Log.d("TagFromIntent", cardUid);
@@ -500,19 +507,16 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
 
                 final CommandResult<CardInfo> execute = command.execute(cardUid);
                 CardInfo detectedCardInfo = execute.getResult();
-                Log.d("cardInfo", "ini card infonnya bro : "+detectedCardInfo);
+                Log.d("cardInfo", "ini card infonnya bro : "+detectedCardInfo.toString());
                 Log.d("executeSuccess", "executeIsSuccess = " + execute.isSuccess());
                 if (execute.isSuccess()) {
-                    cardProcessor.getBalance(detectedCardInfo);
-                    cardProcessor.updateBalance(detectedCardInfo, 1);
-//                    switch (getCommand()) {
-//                        case MDDCommand.COMMAND_GET_BALANCE:
-//                            cardProcessor.getBalance(detectedCardInfo);
-//                            break;
-//                        case MDDCommand.COMMAND_UPDATE_BALANCE:
-//                            cardProcessor.updateBalance(detectedCardInfo, 1);
-//                            break;
-//                    }
+                    if (detectedCardInfo.getBankType().equalsIgnoreCase("DKI-NEW")){
+                        runOnUiThread(() -> MainActivity.this.onBalanceInfoAvailable(detectedCardInfo));
+                        mProgress.setVisibility(View.GONE);
+                    }else {
+                        cardProcessor.getBalance(detectedCardInfo);
+                        cardProcessor.updateBalance(detectedCardInfo, 1);
+                    }
                 } else {
                     runOnUiThread(() -> {
                         Log.e("error", "Messagenya : "+execute.getMessage());
@@ -553,7 +557,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
             public void onErrorNfcCardMsg(int errorCode) {
                 runOnUiThread(() -> MainActivity.this.onUpdateBalanceError(""));
             }
-        });
+        }, 0);
     }
 
     @Override

app/src/main/java/id/mdd/implementationpartnerconnect/RXReader.java

@@ -35,11 +35,11 @@ public class RXReader {
                         configService.getTid(),
                         configService.getToken(),
                         accessToken
-                );
+                , 1);
                 nativeLib nativeLibrary = new nativeLib(context, deviceDriver);
 
                 InitDebugCertificate debugCertificate = new InitDebugCertificate();
-                InitReader reader = debugCertificate.getDebug(nativeLibrary, context, deviceDriver, config);
+                InitReader reader = debugCertificate.getDebug(nativeLibrary, context, deviceDriver, config, true);
                 emitter.onSuccess(reader);
             } catch (Exception e) {
                 emitter.onError(e);

app/src/main/res/xml/network_security_config.xml

+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">apidev.mdd.co.id</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file