2896 Commits

Author SHA1 Message Date
Seán Mac Gillicuddy
37698316ab
Merge pull request #1276 from kiwix/feature/LocalFileTransfer
GSoC 2019 Deliverable: Local File Transfer
2019-08-15 09:30:17 +01:00
Adeel Zafar
7a2d10d2a7 Resolve lint errors in ZimHostActivity 2019-08-15 04:13:15 +05:00
Adeel Zafar
50e072bf18 Resolve string concatenation in setText
Set args in strings.xml value
2019-08-15 04:03:38 +05:00
Adeel Zafar
089dc8b00d Resolve lint warnings 2019-08-15 03:46:20 +05:00
Adeel Zafar
37b7b5050e Fix foreground notification
App crashes on clicking STOP
2019-08-15 03:26:45 +05:00
Adeel Zafar
30f44d8520 Merge branch 'develop' into iadeelzafar/wifi-hotspot 2019-08-15 01:56:59 +05:00
Adeel Zafar
ca12e17910 Integrate kiwix-serve
Pass selected Zim Paths to HotspotService
Starting/stopping server in WebServerHelper
Refactor startWebServerHelper()
Add check for no books selected
Refactor foreground notification
Remove updateNotification
2019-08-15 01:55:54 +05:00
mhutti1
d221c3e00c #1375 Switch bottom bar to LinearLayout 2019-08-14 22:45:33 +02:00
mhutti1
3dc796e142 #579 Move snackbar above bottom bar 2019-08-14 21:48:08 +02:00
Aditya-Sood
737a142718 Merge branch 'develop' into feature/LocalFileTransfer 2019-08-14 22:36:00 +05:30
Julian Harty
ed1a63a21f
Merge pull request #1372 from kiwix/julianharty/implement-issue-1370
Added MONKEY property which facilitates testing using Android Monkey.
2019-08-14 17:43:11 +01:00
julianharty
cbada72157 Added MONKEY property which facilitates testing using Android Monkey.
See https://github.com/kiwix/kiwix-android/issues/1370 for details.
2019-08-14 16:26:38 +01:00
Seán Mac Gillicuddy
f9321d7ac8
Merge pull request #1371 from kiwix/hotfix/macgills/travis-denied-gradle
Travis Build Fix
2019-08-14 16:23:45 +01:00
Sean Mac Gillicuddy
994ae72061 Travis Build Fix 2019-08-14 16:16:41 +01:00
Sean Mac Gillicuddy
8ae692cfbe #1333 Why create an empty text.text and hidden .storageLocationMarker? 2019-08-14 16:14:05 +01:00
Seán Mac Gillicuddy
0701c1aa7b
Merge pull request #1366 from kiwix/feature/macgills/#1359-delete-bookmark
#1359 Unable to remove Bookmark from bottom bar
2019-08-14 13:21:16 +01:00
Isaac Hutt
c3f7e6f0ad
Merge pull request #1365 from kiwix/julianharty/fix-issue-1364
Fix for a bug that affects custom apps missing their contents.
2019-08-14 14:14:22 +02:00
Seán Mac Gillicuddy
15ddc39b61
Merge pull request #1367 from kiwix/macgills/feature/#1319-lint-synthetic-accessor
#1319 update project inspection settings
2019-08-14 12:59:23 +01:00
Aditya-Sood
35a0bffb47 Remove extra code-style and inspection profile 2019-08-14 17:19:43 +05:30
julianharty
37d3f43c29 Applied changes suggested in https://github.com/kiwix/kiwix-android/pull/1365
Additional testing notes available in #1364
2019-08-14 12:41:20 +01:00
Sean Mac Gillicuddy
037ead23f8 #1319 update project inspection settings 2019-08-14 11:46:17 +01:00
Sean Mac Gillicuddy
338c607ce6 #1359 Unable to remove Bookmark from bottom bar 2019-08-14 11:31:27 +01:00
Aditya-Sood
a1c5c6a1ed Minor restyle 2019-08-14 00:38:05 +05:30
Aditya-Sood
1f154259bb Code cleanup
Removed extra methods + refactor
2019-08-14 00:21:12 +05:30
Adeel Zafar
d1bfa65790 Merge branch 'develop' into iadeelzafar/wifi-hotspot 2019-08-13 23:38:28 +05:00
Adeel Zafar
19a309329a Remove ZimHostAdapter
We're using BooksOnDiskAdapter
2019-08-13 23:21:54 +05:00
Adeel Zafar
9c175bdbaa Get file path of selected books 2019-08-13 22:37:42 +05:00
Aditya-Sood
c856f1cd74 Refactor: Remove use of LFTA as Activity
Keeping with the I in SOLID, WDM now uses a plain Activity instead of LocalFileTransferActivity specifically
2019-08-13 22:50:47 +05:30
Aditya-Sood
e415bd862e Refactor: Remove extra variable filesSent & methods 2019-08-13 22:39:52 +05:30
Aditya-Sood
e0651dd88c Minor refactor 2019-08-13 22:23:28 +05:30
Adeel Zafar
d1b5536173 Resolve merge conflicts 2019-08-13 21:48:38 +05:00
Aditya-Sood
f00abecbd1 Increment: LFTA restricted to 'Device' tab
The 'Get zim from nearby device' option now only shows in 'Device' tab of library
2019-08-13 22:04:39 +05:30
julianharty
cf7e392c85 Fix for a bug that affects custom apps missing their contents.
See https://github.com/kiwix/kiwix-android/issues/1364 for details.
2019-08-13 16:45:03 +01:00
Aditya-Sood
a17db838ff Reformat LocalFileTransfer sub-package 2019-08-13 21:00:24 +05:30
Aditya-Sood
bdf979d973 Fix gitignore issue
Wasn't ignoring some .idea files
2019-08-13 20:46:34 +05:30
Aditya-Sood
bec4b8e3c5 Fix lint errors
- Removed extra comment
- 'SyntheticAccessor' now marked as a warning
2019-08-13 20:29:11 +05:30
Seán Mac Gillicuddy
00c4440de9
Merge pull request #1363 from kiwix/macgills/feature/#1319-lint-synthetic-accessor
#1319 Lint Issue: SyntheticAccessor
2019-08-13 15:31:59 +01:00
Sean Mac Gillicuddy
8675e4b54d #1319 Lint Issue: SyntheticAccessor 2019-08-13 14:54:33 +01:00
Adeel Zafar
a8f30c28af Allow MultiSelection in ZimHostActivity 2019-08-13 18:33:24 +05:00
Seán Mac Gillicuddy
9905ab0d3a
Merge pull request #1362 from kiwix/feature/macgills/#1361-custom-app-contents
#1361 Custom app cannot find contents bug
2019-08-13 14:32:02 +01:00
Aditya-Sood
b1774304ad Merge branch 'develop' into feature/LocalFileTransfer 2019-08-13 18:09:28 +05:30
Adeel Zafar
bc3c6c958a Allow MultiSelection in ZimHostActivity 2019-08-13 17:35:22 +05:00
Sean Mac Gillicuddy
9349e29502 #1361 Custom app cannot find contents bug 2019-08-13 13:17:57 +01:00
Adeel Zafar
635bc4ee8d Fix#1357 Dismiss foreground notification automatically 2019-08-13 15:44:25 +05:00
Aditya-Sood
d2c3e447c5 Refactor FileListAdapter
Use ButterKnife for list items
2019-08-12 21:20:02 +05:30
Aditya-Sood
20e1eebf37 Refactor isLocationServiceEnabled()
- Change method implementation
- Inject LocationManager into LFTA
2019-08-12 20:44:14 +05:30
Adeel Zafar
6f45144482 Refactor onServerFailed() Toast message 2019-08-12 18:20:35 +05:00
Aditya-Sood
1baafc9db4 Refactor KiwixWifiP2pBroadcastReceiver
Forward only what's required to WDM
2019-08-12 18:39:15 +05:30
Adeel Zafar
eb109078c2 Revert refactor setText() in ZimHostActivity 2019-08-12 18:09:06 +05:00
Aditya-Sood
d78f07be6a Refactor WDM
Remove extra null checks for wifi-p2p manager
2019-08-12 18:22:09 +05:30