Changed the base url in raveconstants back as is

removed the mockito test library
adjusted the logic for all payment options for nullView

Author: mikelis135

raveandroid/build.gradle

@@ -39,6 +39,5 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-scalars:2.1.0'
     implementation 'com.scottyab:aescrypt:0.0.1'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.23.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }

raveandroid/src/main/java/com/flutterwave/raveandroid/RaveConstants.java

@@ -12,11 +12,11 @@ public class RaveConstants {
     public static String PUBLIC_KEY = "FLWPUBK-e634d14d9ded04eaf05d5b63a0a06d2f-X"; //test
 //    public static String ENCRYPTION_KEY = "FLWSECK-bb971402072265fb156e90a3578fe5e6-X"; //test
     public static String ENCRYPTION_KEY = "bb9714020722eb4cf7a169f2";
-    public static String STAGING_URL = "https://ravesandbox.azurewebsites.net";
-    public static String LIVE_URL = "https://raveapi.azurewebsites.net";
+    //    public static String STAGING_URL = "https://ravesandbox.azurewebsites.net";
+//    public static String LIVE_URL = "https://raveapi.azurewebsites.net";
     //Todo: change back BAse URL
-//public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
-//    public static String LIVE_URL = "https://api.ravepay.co";
+    public static String STAGING_URL = "https://ravesandboxapi.flutterwave.com";
+    public static String LIVE_URL = "https://api.ravepay.co";
 
     public static String VBV = "VBVSECURECODE";
     public static String GTB_OTP = "GTB_OTP";

raveandroid/src/main/java/com/flutterwave/raveandroid/account/AccountFragment.java

@@ -437,10 +437,9 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new AccountPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ach/AchFragment.java

@@ -240,10 +240,9 @@ public void onRequerySuccessful(RequeryResponse response, String responseAsJSONS
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new AchPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/banktransfer/BankTransferFragment.java

@@ -330,10 +330,9 @@ public void onAmountValidationFailed() {
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new BankTransferPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/card/CardFragment.java

@@ -229,10 +229,9 @@ public void onNoAuthInternationalSuggested(final Payload payload) {
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new CardPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ghmobilemoney/GhMobileMoneyFragment.java

@@ -329,10 +329,9 @@ public void onPollingRoundComplete(String flwRef, String txRef, String publicKey
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new GhMobileMoneyPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/mpesa/MpesaFragment.java

@@ -261,10 +261,9 @@ public void onPollingRoundComplete(String flwRef, String txRef, String publicKey
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new MpesaPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }
 

raveandroid/src/main/java/com/flutterwave/raveandroid/ugmobilemoney/UgMobileMoneyFragment.java

@@ -267,10 +267,9 @@ public void onPollingRoundComplete(String flwRef, String txRef, String publicKey
     @Override
     public void onResume() {
         super.onResume();
-        if (presenter != null) {
+        if (presenter == null) {
             presenter = new UgMobileMoneyPresenter(getActivity(), this);
         }
-        assert presenter != null;
         presenter.onAttachView(this);
     }