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

Resolve merge conflicts

Browse Source
This commit is contained in:
Adeel Zafar 2019-08-13 21:48:38 +05:00
commit d1b5536173
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,8 @@ public class ZimHostActivity extends BaseActivity implements
private static final int LOCATION_SETTINGS_PERMISSION_RESULT = 101; private static final int LOCATION_SETTINGS_PERMISSION_RESULT = 101;
private Intent serviceIntent; private Intent serviceIntent;
private Task<LocationSettingsResponse> task; private Task<LocationSettingsResponse> task;
BooksOnDiskAdapter booksAdapter;
private BooksOnDiskAdapter booksAdapter;
HotspotService hotspotService; HotspotService hotspotService;
String ip; String ip;
boolean bound; boolean bound;
@ -185,7 +186,6 @@ public class ZimHostActivity extends BaseActivity implements
booksAdapter.setItems(booksList); booksAdapter.setItems(booksList);
} }
@Override protected void onStart() { @Override protected void onStart() {
super.onStart(); super.onStart();
bindService(); bindService();