resolve all multiple time activity launch issues

apache · Mar 13, 2021 · 6419323 · 6419323
1 parent 592099e
commit 6419323
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 0 deletions.
diff --git a/...java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java b/...java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
@@ -164,13 +164,15 @@ void onRetry() {
     void viewDepositAccounts() {
         Intent intent = new Intent(getActivity(), DepositAccountsActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
     @OnClick(R.id.ll_loan_accounts)
     void viewLoanAccounts() {
         Intent intent = new Intent(getActivity(), LoanAccountsActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
@@ -187,27 +189,31 @@ void updateCustomerStatus() {
     void showIdentificationCards() {
         Intent intent = new Intent(getActivity(), IdentificationsActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
     @OnClick(R.id.iv_customer_profile)
     void showCustomerProfileImage() {
         Intent intent = new Intent(getActivity(), CustomerProfileActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
     @OnClick(R.id.ll_activities)
     void showCustomerActivities() {
         Intent intent = new Intent(getActivity(), CustomerActivitiesActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
     @OnClick(R.id.ll_payroll)
     void showPayrollActivity() {
         Intent intent = new Intent(getActivity(), PayrollActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
@@ -218,6 +224,7 @@ void editCustomer() {
         intent.putExtra(ConstantKeys.CUSTOMER_ACTION, CustomerAction.EDIT);
         intent.putExtra(ConstantKeys.CUSTOMER, customer);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 

diff --git a/...src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java b/...src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
@@ -172,6 +172,7 @@ void addCustomer() {
         isNewCustomer = true;
         Intent intent = new Intent(getActivity(), CreateCustomerActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_ACTION, CustomerAction.CREATE);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
@@ -321,6 +322,8 @@ public void onItemClick(View childView, int position) {
         Intent customerDetailsIntent = new Intent(getActivity(), CustomerDetailsActivity.class);
         customerDetailsIntent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER,
                 customers.get(position).getIdentifier());
+        customerDetailsIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
+                | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivityForResult(customerDetailsIntent, CUSTOMER_STATUS);
     }
 

diff --git a/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
@@ -57,6 +57,7 @@ void viewCustomer() {
     void createCustomer() {
         Intent intent = new Intent(getActivity(), CreateCustomerActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_ACTION, CustomerAction.CREATE);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 }
diff --git a/...pache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java b/...pache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
@@ -105,6 +105,7 @@ void createDepositAccount() {
         Intent intent = new Intent(getActivity(), CreateDepositActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
         intent.putExtra(ConstantKeys.DEPOSIT_ACTION, DepositAction.CREATE);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 

diff --git a/app/src/main/java/org/apache/fineract/ui/online/groups/groupdetails/GroupDetailsFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/groups/groupdetails/GroupDetailsFragment.kt
@@ -81,6 +81,7 @@ class GroupDetailsFragment : FineractBaseFragment() {
                 val intent = Intent(activity, CreateGroupActivity::class.java).apply {
                     putExtra(Constants.GROUP, group)
                     putExtra(Constants.GROUP_ACTION, GroupAction.EDIT)
+                    flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
                 }
                 startActivity(intent)
             }

diff --git a/app/src/main/java/org/apache/fineract/ui/online/groups/grouplist/GroupListFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/groups/grouplist/GroupListFragment.kt
@@ -115,6 +115,7 @@ class GroupListFragment : FineractBaseFragment(), OnItemClickListener {
     override fun onItemClick(childView: View?, position: Int) {
         val intent = Intent(context, GroupDetailsActivity::class.java).apply {
             putExtra(Constants.GROUP, groupList[position])
+            flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
         }
         startActivity(intent)
     }
@@ -126,6 +127,7 @@ class GroupListFragment : FineractBaseFragment(), OnItemClickListener {
     fun addGroup() {
         val intent = Intent(activity, CreateGroupActivity::class.java).apply {
             putExtra(Constants.GROUP_ACTION, GroupAction.CREATE)
+            flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
         }
         startActivity(intent)
     }

diff --git a/.../apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java b/.../apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
@@ -103,6 +103,7 @@ void createIdentifier() {
         Intent intent = new Intent(getActivity(), CreateIdentificationActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
         intent.putExtra(ConstantKeys.IDENTIFICATION_ACTION, Action.CREATE);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 

diff --git a/...java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java b/...java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
@@ -119,6 +119,7 @@ void onRetry() {
     void createNewLoan() {
         Intent intent = new Intent(getActivity(), LoanApplicationActivity.class);
         intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, customerIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 

diff --git a/...a/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java b/...a/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
@@ -145,6 +145,7 @@ void showPlannedPayment() {
         Intent intent = new Intent(getActivity(), PlannedPaymentActivity.class);
         intent.putExtra(ConstantKeys.PRODUCT_IDENTIFIER, productIdentifier);
         intent.putExtra(ConstantKeys.CASE_IDENTIFIER, caseIdentifier);
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }
 
@@ -153,6 +154,7 @@ void showDebtIncomeReport() {
         Intent intent = new Intent(getActivity(), DebtIncomeReportActivity.class);
         intent.putExtra(ConstantKeys.LOAN_CREDITWORTHINESSSNAPSHOTS, (new Gson()).toJson(
                 loanAccount.getLoanParameters().getCreditWorthinessSnapshots()));
+        intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(intent);
     }