removing event bus + improving listeners

app/build.gradle

@@ -61,7 +61,6 @@ dependencies {
     implementation 'com.google.crypto.tink:tink-android:1.6.1'
     implementation project(path: ':provisioning')
 
-    implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.yuriy-budiyev:code-scanner:2.1.2'
     implementation 'com.github.firdausmaulan:AVLoadingIndicatorView:2.3.0'
 

app/src/main/java/com/espressif/ui/activities/AddDeviceActivity.java

@@ -49,20 +49,18 @@
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPDevice;
 import com.espressif.provisioning.ESPProvisionManager;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.provisioning.listeners.QRCodeScanListener;
 import com.espressif.wifi_provisioning.R;
 import com.google.android.material.card.MaterialCardView;
 import com.wang.avi.AVLoadingIndicatorView;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-public class AddDeviceActivity extends AppCompatActivity {
+public class AddDeviceActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = AddDeviceActivity.class.getSimpleName();
 
@@ -95,8 +93,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         intent = new Intent();
         sharedPreferences = getSharedPreferences(AppConstants.ESP_PREFERENCES, Context.MODE_PRIVATE);
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
+        provisionManager.addListener(this);
         initViews();
-        EventBus.getDefault().register(this);
     }
 
     @Override
@@ -150,7 +148,6 @@ protected void onPause() {
     protected void onDestroy() {
 
         hideLoading();
-        EventBus.getDefault().unregister(this);
 //        if (cameraPreview != null) {
 //            cameraPreview.release();
 //        }
@@ -220,8 +217,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(DeviceConnectionEvent event) {
+    @Override public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());
 

app/src/main/java/com/espressif/ui/activities/BLEProvisionLanding.java

@@ -49,19 +49,17 @@
 import com.espressif.provisioning.DeviceConnectionEvent;
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.listeners.BleScanListener;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.ui.adapters.BleDeviceListAdapter;
 import com.espressif.ui.models.BleDevice;
 import com.espressif.ui.utils.Utils;
 import com.espressif.wifi_provisioning.BuildConfig;
 import com.espressif.wifi_provisioning.R;
 
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class BLEProvisionLanding extends ManualProvBaseActivity {
+public class BLEProvisionLanding extends ManualProvBaseActivity implements EventUpdateListener {
 
     private static final String TAG = BLEProvisionLanding.class.getSimpleName();
 
@@ -198,7 +196,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
         }
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Override
     public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "ON Device Prov Event RECEIVED : " + event.getEventType());

app/src/main/java/com/espressif/ui/activities/ManualProvBaseActivity.java

@@ -27,7 +27,6 @@
 import com.espressif.provisioning.ESPProvisionManager;
 import com.espressif.wifi_provisioning.R;
 
-import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -48,12 +47,10 @@ protected void onCreate(Bundle savedInstanceState) {
         securityType = getIntent().getIntExtra(AppConstants.KEY_SECURITY_TYPE, AppConstants.SEC_TYPE_DEFAULT);
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
         sharedPreferences = getSharedPreferences(AppConstants.ESP_PREFERENCES, Context.MODE_PRIVATE);
-        EventBus.getDefault().register(this);
     }
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
         super.onDestroy();
     }
 

app/src/main/java/com/espressif/ui/activities/ProofOfPossessionActivity.java

@@ -32,16 +32,14 @@
 import com.espressif.provisioning.DeviceConnectionEvent;
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.provisioning.listeners.ResponseListener;
 import com.espressif.wifi_provisioning.R;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 
-public class ProofOfPossessionActivity extends AppCompatActivity {
+public class ProofOfPossessionActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = ProofOfPossessionActivity.class.getSimpleName();
 
@@ -62,8 +60,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
         initViews();
-        EventBus.getDefault().register(this);
 
+        provisionManager.addListener(this);
         deviceName = provisionManager.getEspDevice().getDeviceName();
 
         if (!TextUtils.isEmpty(deviceName)) {
@@ -83,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        provisionManager.removeListener(this);
         super.onDestroy();
     }
 
@@ -93,7 +91,7 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Override
     public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());

app/src/main/java/com/espressif/ui/activities/ProvisionActivity.java

@@ -30,16 +30,13 @@
 
 import com.espressif.AppConstants;
 import com.espressif.provisioning.DeviceConnectionEvent;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.wifi_provisioning.R;
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
 import com.espressif.provisioning.listeners.ProvisionListener;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-public class ProvisionActivity extends AppCompatActivity {
+public class ProvisionActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = ProvisionActivity.class.getSimpleName();
 
@@ -66,8 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
         passphraseValue = intent.getStringExtra(AppConstants.KEY_WIFI_PASSWORD);
         dataset = intent.getStringExtra(AppConstants.KEY_THREAD_DATASET);
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
+        provisionManager.addListener(this);
         initViews();
-        EventBus.getDefault().register(this);
 
         Log.d(TAG, "Selected AP -" + ssidValue);
         showLoading();
@@ -82,12 +79,11 @@ public void onBackPressed() {
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        provisionManager.removeListener(this);
         super.onDestroy();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(DeviceConnectionEvent event) {
+    @Override public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());
 

app/src/main/java/com/espressif/ui/activities/ProvisionLanding.java

@@ -34,15 +34,14 @@
 import com.espressif.AppConstants;
 import com.espressif.provisioning.DeviceConnectionEvent;
 import com.espressif.provisioning.ESPConstants;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.ui.utils.Utils;
 import com.espressif.wifi_provisioning.R;
 
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 
-public class ProvisionLanding extends ManualProvBaseActivity {
+public class ProvisionLanding extends ManualProvBaseActivity implements EventUpdateListener {
 
     private static final String TAG = ProvisionLanding.class.getSimpleName();
 
@@ -92,8 +91,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
         }
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(DeviceConnectionEvent event) {
+    @Override public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Prov Event RECEIVED : " + event.getEventType());
 

app/src/main/java/com/espressif/ui/activities/ThreadConfigActivity.java

@@ -37,19 +37,16 @@
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
 import com.espressif.provisioning.WiFiAccessPoint;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.provisioning.listeners.WiFiScanListener;
 import com.espressif.ui.utils.Utils;
 import com.espressif.wifi_provisioning.R;
 import com.google.android.gms.threadnetwork.ThreadNetwork;
 import com.google.android.gms.threadnetwork.ThreadNetworkCredentials;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.ArrayList;
 
-public class ThreadConfigActivity extends AppCompatActivity {
+public class ThreadConfigActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = ThreadConfigActivity.class.getSimpleName();
 
@@ -72,16 +69,15 @@ protected void onCreate(Bundle savedInstanceState) {
         handler = new Handler();
         threadNetworkList = new ArrayList<>();
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
+        provisionManager.addListener(this);
         scanCapAvailable = getIntent().getBooleanExtra(AppConstants.KEY_THREAD_SCAN_AVAILABLE, false);
-
         initViews();
-        EventBus.getDefault().register(this);
         getThreadPreferredCredentials();
     }
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        provisionManager.removeListener(this);
         super.onDestroy();
     }
 
@@ -91,7 +87,7 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Override
     public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());

app/src/main/java/com/espressif/ui/activities/WiFiConfigActivity.java

@@ -31,13 +31,11 @@
 import com.espressif.provisioning.DeviceConnectionEvent;
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.wifi_provisioning.R;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
-public class WiFiConfigActivity extends AppCompatActivity {
+public class WiFiConfigActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = WiFiConfigActivity.class.getSimpleName();
 
@@ -54,13 +52,13 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_wifi_config);
 
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
+        provisionManager.addListener(this);
         initViews();
-        EventBus.getDefault().register(this);
     }
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        provisionManager.removeListener(this);
         super.onDestroy();
     }
 
@@ -70,7 +68,7 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Override
     public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());

app/src/main/java/com/espressif/ui/activities/WiFiScanActivity.java

@@ -40,18 +40,15 @@
 import com.espressif.provisioning.ESPConstants;
 import com.espressif.provisioning.ESPProvisionManager;
 import com.espressif.provisioning.WiFiAccessPoint;
+import com.espressif.provisioning.listeners.EventUpdateListener;
 import com.espressif.provisioning.listeners.WiFiScanListener;
 import com.espressif.ui.adapters.WiFiListAdapter;
 import com.espressif.wifi_provisioning.R;
 import com.google.android.material.textfield.TextInputLayout;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.ArrayList;
 
-public class WiFiScanActivity extends AppCompatActivity {
+public class WiFiScanActivity extends AppCompatActivity implements EventUpdateListener {
 
     private static final String TAG = WiFiScanActivity.class.getSimpleName();
 
@@ -80,6 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
         wifiAPList = new ArrayList<>();
         handler = new Handler();
         provisionManager = ESPProvisionManager.getInstance(getApplicationContext());
+        provisionManager.addListener(this);
 
         String deviceName = provisionManager.getEspDevice().getDeviceName();
         String wifiMsg = String.format(getString(R.string.setup_instructions), deviceName);
@@ -116,13 +114,12 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
             }
         });
 
-        EventBus.getDefault().register(this);
         startWifiScan();
     }
 
     @Override
     protected void onDestroy() {
-        EventBus.getDefault().unregister(this);
+        provisionManager.removeListener(this);
         super.onDestroy();
     }
 
@@ -132,8 +129,7 @@ public void onBackPressed() {
         super.onBackPressed();
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(DeviceConnectionEvent event) {
+    @Override public void onEvent(DeviceConnectionEvent event) {
 
         Log.d(TAG, "On Device Connection Event RECEIVED : " + event.getEventType());
 

provisioning/build.gradle

@@ -56,7 +56,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.google.protobuf:protobuf-javalite:3.18.0'
     implementation 'com.google.crypto.tink:tink-android:1.6.1'
     implementation 'com.google.android.gms:play-services-vision:20.1.3'