From 145b177616f309e8bd43cb1fac0fd549930f3ee7 Mon Sep 17 00:00:00 2001 From: Adeel Zafar Date: Sat, 1 Jun 2019 19:23:56 +0500 Subject: [PATCH] Add case in onActivityResult for LocationSettings Checking the result of LocationSettings resolution in onActivityResult --- .../kiwix/kiwixmobile/main/MainActivity.java | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java index 902de8478..e97af2c1b 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java @@ -1744,6 +1744,27 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } } return; + + //Checking the result code for LocationSettings resolution + case 101: + final LocationSettingsStates states = LocationSettingsStates.fromIntent(data); + switch (resultCode) { + case Activity.RESULT_OK: + // All required changes were successfully made + Toast.makeText(MainActivity.this, states.isLocationPresent() + "", Toast.LENGTH_SHORT) + .show(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + wifiHotspotManager.turnOnHotspot(); + } + break; + case Activity.RESULT_CANCELED: + // The user was asked to change settings, but chose not to + Toast.makeText(MainActivity.this, "Canceled", Toast.LENGTH_SHORT).show(); + break; + default: + break; + } + break; default: break; } @@ -2268,28 +2289,4 @@ public class MainActivity extends BaseActivity implements WebViewCallback, } }); } - - //@Override - //protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // final LocationSettingsStates states = LocationSettingsStates.fromIntent(data); - // switch (requestCode) { - // case 101: - // switch (resultCode) { - // case Activity.RESULT_OK: - // // All required changes were successfully made - // Toast.makeText(MainActivity.this,states.isLocationPresent()+"",Toast.LENGTH_SHORT).show(); - // if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - // wifiHotspotManager.turnOnHotspot(); - // } - // break; - // case Activity.RESULT_CANCELED: - // // The user was asked to change settings, but chose not to - // Toast.makeText(MainActivity.this,"Canceled",Toast.LENGTH_SHORT).show(); - // break; - // default: - // break; - // } - // break; - // } - //} }