kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 05:04:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor startService()

Browse Source
This commit is contained in:
Adeel Zafar 2019-08-19 00:49:23 +05:00
parent 396526af9a
commit f5672a4799
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
View File

@ -86,7 +86,7 @@ public class ZimHostActivity extends BaseActivity implements
private static final String TAG = "ZimHostActivity"; private static final String TAG = "ZimHostActivity";
private static final int MY_PERMISSIONS_ACCESS_FINE_LOCATION = 102; private static final int MY_PERMISSIONS_ACCESS_FINE_LOCATION = 102;
private static final int LOCATION_SETTINGS_PERMISSION_RESULT = 101; private static final int LOCATION_SETTINGS_PERMISSION_RESULT = 101;
private Intent serviceIntent; Intent serviceIntent;
private Task<LocationSettingsResponse> task; private Task<LocationSettingsResponse> task;
ProgressDialog progressDialog; ProgressDialog progressDialog;
@ -96,7 +96,7 @@ public class ZimHostActivity extends BaseActivity implements
private String ip; private String ip;
boolean bound; boolean bound;
private ServiceConnection serviceConnection; private ServiceConnection serviceConnection;
private ArrayList<String> selectedBooksPath = new ArrayList<>(); ArrayList<String> selectedBooksPath = new ArrayList<>();
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@ -170,7 +170,7 @@ public class ZimHostActivity extends BaseActivity implements
// mobileDataDialog(); // mobileDataDialog();
//} else { //} else {
if (isServerStarted) { if (isServerStarted) {
startService(ACTION_STOP_SERVER); createHotspotIntent(ACTION_STOP_SERVER);
} else { } else {
startHotspotManuallyDialog(); startHotspotManuallyDialog();
} }
@ -231,7 +231,7 @@ public class ZimHostActivity extends BaseActivity implements
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED) { == PackageManager.PERMISSION_GRANTED) {
startService(ACTION_IS_HOTSPOT_ENABLED); //If hotspot is already enabled, turn it off createHotspotIntent(ACTION_IS_HOTSPOT_ENABLED); //If hotspot is already enabled, turn it off
} else { } else {
//Ask location permission if not granted //Ask location permission if not granted
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this,
@ -309,7 +309,7 @@ public class ZimHostActivity extends BaseActivity implements
case Activity.RESULT_OK: case Activity.RESULT_OK:
// All required changes were successfully made // All required changes were successfully made
Log.v(TAG, states.isLocationPresent() + ""); Log.v(TAG, states.isLocationPresent() + "");
startService(ACTION_TURN_ON_AFTER_O); createHotspotIntent(ACTION_TURN_ON_AFTER_O);
break; break;
case Activity.RESULT_CANCELED: case Activity.RESULT_CANCELED:
// The user was asked to change settings, but chose not to // The user was asked to change settings, but chose not to
@ -358,7 +358,7 @@ public class ZimHostActivity extends BaseActivity implements
// All location settings are satisfied. The client can initialize location // All location settings are satisfied. The client can initialize location
// requests here. // requests here.
startService(ACTION_TURN_ON_AFTER_O); createHotspotIntent(ACTION_TURN_ON_AFTER_O);
//} //}
} catch (ApiException exception) { } catch (ApiException exception) {
@ -430,7 +430,9 @@ public class ZimHostActivity extends BaseActivity implements
@Override public void onSuccess(String s) { @Override public void onSuccess(String s) {
progressDialog.dismiss(); progressDialog.dismiss();
startService(ACTION_START_SERVER); serviceIntent.putStringArrayListExtra(SELECTED_ZIM_PATHS_KEY, selectedBooksPath);
serviceIntent.setAction(ACTION_START_SERVER);
startService(serviceIntent);
Log.d(TAG, "onSuccess: " + s); Log.d(TAG, "onSuccess: " + s);
} }
@ -444,12 +446,9 @@ public class ZimHostActivity extends BaseActivity implements
}); });
} }
void startService(String ACTION) { void createHotspotIntent(String ACTION) {
if (ACTION.equals(ACTION_START_SERVER)) {
serviceIntent.putStringArrayListExtra(SELECTED_ZIM_PATHS_KEY, selectedBooksPath);
}
serviceIntent.setAction(ACTION); serviceIntent.setAction(ACTION);
this.startService(serviceIntent); startService(serviceIntent);
} }
void mobileDataDialog() { void mobileDataDialog() {
@ -543,7 +542,7 @@ public class ZimHostActivity extends BaseActivity implements
@Override public void onHotspotStateReceived(@NonNull Boolean isHotspotEnabled) { @Override public void onHotspotStateReceived(@NonNull Boolean isHotspotEnabled) {
if (isHotspotEnabled) //if hotspot is already enabled, turn it off. if (isHotspotEnabled) //if hotspot is already enabled, turn it off.
{ {
startService(ACTION_TURN_OFF_AFTER_O); createHotspotIntent(ACTION_TURN_OFF_AFTER_O);
} else //If hotspot is not already enabled, then turn it on. } else //If hotspot is not already enabled, then turn it on.
{ {
setupLocationServices(); setupLocationServices();