Add environment on ConfigService

app/build.gradle

@@ -57,7 +57,7 @@ dependencies {
     implementation(group: 'com.mdd.payment', name: 'isodeplibrary-release', version: '2.1.1', ext: 'aar')
     implementation(group: 'com.mdd.payment', name: 'z91library-release', version: '2.1.0', ext: 'aar')
     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.topup', name: 'update-balance', version: '2.4.3', ext: 'aar')
+    implementation(group: 'com.mdd.service', name: 'partner-connect', version: '2.3.0', ext: 'aar')
+    implementation(group: 'com.mdd.topup', name: 'update-balance', version: '2.4.9', ext: 'aar')
 
 }
\ No newline at end of file

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

@@ -57,6 +57,7 @@ import java.util.Locale;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import id.emhusnan.mdd.service.ConfigService;
 import id.emhusnan.mdd.service.MDDCommand;
 import id.emhusnan.mdd.service.MDDService;
 import id.emhusnan.mdd.service.MDDUpdateBalanceView;
@@ -108,6 +109,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
     Button btnAktivasiAar;
     private MainCardProcessor cardProcessor;
     private InitReader reader;
+    private ConfigService configService;
 
 
     protected int getCommand() {
@@ -162,6 +164,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
         }
 
         reader = ((MyApp) getApplication()).getReader();
+        configService = ((MyApp) getApplication()).getConfigService();
         Log.d("ReaderApp", String.valueOf(reader));
 //        cardProcessor = new MainCardProcessor(MainActivity.this, reader, new UpdateBalanceView() {
 //            @Override
@@ -243,7 +246,6 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
     }
 
 
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -531,6 +533,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
     @Override
     public void onInitReaderComplete(InitReader reader) {
         paxReader = reader;
+        configService = ((MyApp) getApplication()).getConfigService();
         pbloading.setVisibility(View.GONE);
         cardProcessor = new MainCardProcessor(MainActivity.this, reader, new UpdateBalanceView() {
             @Override
@@ -552,7 +555,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
             public void onErrorNfcCardMsg(int errorCode) {
                 runOnUiThread(() -> MainActivity.this.onUpdateBalanceError(""));
             }
-        });
+        }, configService.getEnvironment());
     }
 
     @Override
@@ -579,7 +582,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
             public void onErrorNfcCardMsg(int errorCode) {
                 runOnUiThread(() -> MainActivity.this.onUpdateBalanceError(""));
             }
-        });
+        }, configService.getEnvironment());
 
         String cardUid = ByteArrayToHexString(tag.getId());
         cardProcessor.lockIsoDepCard(tag);
@@ -595,11 +598,11 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
             });
 
             CardInfoCommand command = new CardInfoCommand(paxReader.myReader);
-            Log.e("myReader", "Myreader : "+paxReader.myReader);
+            Log.e("myReader", "Myreader : " + paxReader.myReader);
 
             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);
             Log.d("executeSuccess", "executeIsSuccess = " + execute.isSuccess());
             if (execute.isSuccess()) {
                 switch (getCommand()) {
@@ -612,7 +615,7 @@ public class MainActivity extends AppCompatActivity implements MDDUpdateBalanceV
                 }
             } else {
                 runOnUiThread(() -> {
-                    Log.e("error", "Messagenya : "+execute.getMessage());
+                    Log.e("error", "Messagenya : " + execute.getMessage());
                     MainActivity.this.onUpdateBalanceError("Kartu tidak terdeteksi");
                     cardProcessor.unlockIsoDepCard();
                 });

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

@@ -14,6 +14,7 @@ import android.widget.Toast;
 import com.mdd.aar.deviceid.AarDeviceId;
 import com.mdd.aar.deviceid.DeviceEnvironment;
 import com.mdd.aar.deviceid.exceptions.DeviceNotRegisteredException;
+import com.mdd.topupUnik.ubal.ApiUtils;
 import com.mdd.topupUnik.ubal.InitReader;
 import com.medicom.dudikov.mybanklibrary.nativeLib;
 
@@ -32,6 +33,8 @@ public class MyApp extends Application {
     private final String accessToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJhdXRoLXNlcnZpY2U6MS4wLjAiLCJzdWIiOnsibmFtZSI6IlRlc3RQcm9kMyIsInVzZXJuYW1lIjoiVGVzdFByb2QzIiwiYXV0aF9sZXZlbCI6Ik1FUkNIQU5UIiwibWlkIjoiMWZiNTdmMTY2YTQ4MGU5N2JmN2EzZGNiZjkzMTkyOTMifSwiaWF0IjoxNTk3NzM3NzIxLCJleHAiOjE1OTc4MjQxMjEsIm5iZiI6MTU5NzczNzcyM30.CXM-5mCv91Yo17c9zHXQKPGR5gqAeu-LADta-_qnABYxzmnE4Dx0q7NQ9IYr6cYO6cXp40UW4s632fzVYmPCXH8f0RtSwLPqTT7_lWHK--fHCP-LZOmfgwUBxdNocYY9xAi-NyWqCmTnkjWx91lqh9S9Fcue6nO_KrBqngUpBPhpS0hPwgmkqHXX6yAdVs931NbfNM3cYW9PpGIw8K-OxoPDHByD61uAFxT9FCrTbca7vV3HFQnZEKpwxxdECu7DCQAsGTl7JqfbH2j5swe_t97rSDAGyE1HRzGX-SMqPULkC-XravF2m_HucosacYQuSdRaxAWfEIQvtQhAcRXwTA";
     private InitReader reader;
     int idDriver = nativeLib.USE_NFC_NATIVE;
+    private ConfigService configService;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -50,8 +53,15 @@ public class MyApp extends Application {
             } else {
                 doInit();
             }
-        }else{
+        } else {
             Log.d("lariKemana", "Lari ke else bro");
+            configService = new ConfigService();
+            configService.setMid(GIVE_MID);
+            configService.setTid(GIVE_TID);
+            configService.setToken(GIVEN_TOKEN);
+            configService.setAccessToken(accessToken);
+            configService.setEnvironment(ApiUtils.dev_environment);
+
             new RXReader().initEdcReader(this, nativeLib.USE_NFC_NATIVE)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
@@ -77,11 +87,12 @@ public class MyApp extends Application {
     }
 
     public void doInit() {
-        ConfigService configService = new ConfigService();
+        configService = new ConfigService();
         configService.setMid(GIVE_MID);
         configService.setTid(GIVE_TID);
         configService.setToken(GIVEN_TOKEN);
         configService.setAccessToken(accessToken);
+        configService.setEnvironment(ApiUtils.dev_environment);
         AarDeviceId aarDeviceId = new AarDeviceId(this);
         String deviceId = "";
         try {
@@ -98,7 +109,7 @@ public class MyApp extends Application {
             if (reader != null) {
                 Log.e("MyApp", "Aktivasi library sukses");
                 Toast.makeText(this, "Aktivasi library sukses", Toast.LENGTH_SHORT).show();
-            }else {
+            } else {
                 Log.e("MyApp", "Library belum aktif reader null");
                 Toast.makeText(this, "Library belum aktif reader null", Toast.LENGTH_SHORT).show();
             }
@@ -111,4 +122,8 @@ public class MyApp extends Application {
     public InitReader getReader() {
         return reader;
     }
+
+    public ConfigService getConfigService() {
+        return configService;
+    }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import com.mdd.aar.deviceid.AarDeviceId;
 import com.mdd.aar.deviceid.DeviceEnvironment;
 import com.mdd.aar.deviceid.exceptions.DeviceNotRegisteredException;
+import com.mdd.topupUnik.ubal.ApiUtils;
 import com.mdd.topupUnik.ubal.InitDebugCertificate;
 import com.mdd.topupUnik.ubal.InitReader;
 import com.medicom.dudikov.mybanklibrary.nativeLib;
@@ -30,11 +31,13 @@ public class RXReader {
                 configService.setMid("ba7db816e59612f8ce1630a095ef01c5");
                 configService.setTid("1234");
                 configService.setToken("5b423ef49cb029340d7231cace0de201");
+                configService.setEnvironment(ApiUtils.dev_environment);
                 LibraryConfig config = new LibraryConfig(
                         configService.getMid(),
                         configService.getTid(),
                         configService.getToken(),
-                        accessToken
+                        accessToken,
+                        configService.getEnvironment()
                 );
                 nativeLib nativeLibrary = new nativeLib(context, deviceDriver);