fix(bottomsheet): android prevent crash on back button

farfromrefug · farfromrefug · commit 12457132196c · 2021-04-16T17:43:22.000+02:00
diff --git a/src/bottomsheet/bottomsheet.android.ts b/src/bottomsheet/bottomsheet.android.ts
@@ -68,7 +68,10 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
                         }
 
                         owner.notify(args);
-                        return args.cancel || owner.onBackPressed();
+                        if (!args.cancel) {
+                            args.cancel = owner.onBackPressed();
+                        }
+                        return args.cancel;
                     }
                 });
                 const dialog = new com.nativescript.material.bottomsheet.BottomSheetDialog(fragment.getActivity(), theme);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,10 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`owner.notify(args);`
`71`		`- return args.cancel \|\| owner.onBackPressed();`
	`71`	`+ if (!args.cancel) {`
	`72`	`+ args.cancel = owner.onBackPressed();`
	`73`	`+ }`
	`74`	`+ return args.cancel;`
`72`	`75`	`}`
`73`	`76`	`});`
`74`	`77`	`const dialog = new com.nativescript.material.bottomsheet.BottomSheetDialog(fragment.getActivity(), theme);`