fix 'add new family' to check instance from class

opensrp · Oct 5, 2021 · 25cd03a · 25cd03a
1 parent 7b08848
commit 25cd03a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/opensrp-chw-core/src/main/java/org/smartregister/chw/core/listener/NavigationListener.java b/opensrp-chw-core/src/main/java/org/smartregister/chw/core/listener/NavigationListener.java
@@ -74,11 +74,12 @@ public void onClick(View v) {
                     activity.finish();
                     break;
                 case CoreConstants.DrawerMenu.ADD_NEW_FAMILY:
-                    if (activity instanceof BaseRegisterActivity) {
+                    Class<?> newFamilyRegisterClass = getActivity(CoreConstants.REGISTERED_ACTIVITIES.ADD_NEW_FAMILY);
+                    if (newFamilyRegisterClass.isInstance(activity)) {
                         BaseRegisterActivity baseRegisterActivity = (BaseRegisterActivity) activity;
                         baseRegisterActivity.startRegistration();
                     } else {
-                        Intent intent = new Intent(activity, getActivity(CoreConstants.REGISTERED_ACTIVITIES.REPORTS_ACTIVITY));
+                        Intent intent = new Intent(activity, newFamilyRegisterClass);
                         intent.putExtra(CoreConstants.ACTIVITY_PAYLOAD.ACTION, CoreConstants.ACTION.START_REGISTRATION);
                         activity.startActivity(intent);
                     }