From 97d23848425fc6620743c94217cf8d3a3ad822c6 Mon Sep 17 00:00:00 2001 From: Jochen Heizmann Date: Sat, 24 Sep 2016 16:28:18 +0200 Subject: [PATCH 1/2] On Samsug Galaxy S3 before updating to the latest version of the google play store I had a crash in onActivityResult of the BBMonkeyStore Class while trying to read the response. This should fix it --- modules/brl/native/monkeystore.android.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/brl/native/monkeystore.android.java b/modules/brl/native/monkeystore.android.java index f5d9b4e3..c9259a4c 100644 --- a/modules/brl/native/monkeystore.android.java +++ b/modules/brl/native/monkeystore.android.java @@ -187,7 +187,12 @@ public void onServiceConnected( ComponentName name,IBinder service ){ @Override public void onActivityResult( int requestCode,int resultCode,Intent data ){ - if( requestCode!=_reqCode ) return; + if( requestCode!=_reqCode ) return; + + if (resultCode == android.app.Activity.RESULT_CANCELED) { + _result=1; //cancelled + _running=false; + } // bb_std_lang.print( "Buy result="+data.getIntExtra( "RESPONSE_CODE",12345 ) ); From 6a053c38315ea9511f6e49283a92c8b898361d8e Mon Sep 17 00:00:00 2001 From: Jochen Heizmann Date: Sat, 24 Sep 2016 16:33:35 +0200 Subject: [PATCH 2/2] Added a return to leave onActivityResult, cleaned up indenting --- modules/brl/native/monkeystore.android.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/brl/native/monkeystore.android.java b/modules/brl/native/monkeystore.android.java index c9259a4c..659171b8 100644 --- a/modules/brl/native/monkeystore.android.java +++ b/modules/brl/native/monkeystore.android.java @@ -187,12 +187,13 @@ public void onServiceConnected( ComponentName name,IBinder service ){ @Override public void onActivityResult( int requestCode,int resultCode,Intent data ){ - if( requestCode!=_reqCode ) return; + if( requestCode!=_reqCode ) return; - if (resultCode == android.app.Activity.RESULT_CANCELED) { - _result=1; //cancelled - _running=false; - } + if (resultCode == android.app.Activity.RESULT_CANCELED) { + _result=1; //cancelled + _running=false; + return; + } // bb_std_lang.print( "Buy result="+data.getIntExtra( "RESPONSE_CODE",12345 ) );