3259 Commits

Author SHA1 Message Date
Sean Mac Gillicuddy
c32aed4e46 Move common configuration of all modules into buildSrc 2019-10-02 14:20:54 +01:00
Sean Mac Gillicuddy
21e8988ccd update lint baseline 2019-10-02 09:51:35 +01:00
Sean Mac Gillicuddy
d5f3a04b6b Merge branch 'develop' into feature/macgills/modularisation
# Conflicts:
#	app/src/main/java/eu/mhutti1/utils/storage/StorageDevice.kt
#	app/src/main/java/org/kiwix/kiwixmobile/base/BaseContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/base/BaseFragment.kt
#	app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarkItem.kt
#	app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/bookmark/BookmarksModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/DataModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/LibraryDataSource.java
#	app/src/main/java/org/kiwix/kiwixmobile/data/local/entity/NetworkLanguageSpec.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/components/ServiceComponent.kt
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/ActivityBindingModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt
#	app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/Computation.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/IO.java
#	app/src/main/java/org/kiwix/kiwixmobile/di/qualifiers/MainThread.java
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/model/Base64String.kt
#	app/src/main/java/org/kiwix/kiwixmobile/downloader/model/Seconds.kt
#	app/src/main/java/org/kiwix/kiwixmobile/extensions/BookExtensions.kt
#	app/src/main/java/org/kiwix/kiwixmobile/extensions/ConnectivityManagerExtensions.kt
#	app/src/main/java/org/kiwix/kiwixmobile/extensions/ImageViewExtensions.kt
#	app/src/main/java/org/kiwix/kiwixmobile/extensions/TextViewExtensions.kt
#	app/src/main/java/org/kiwix/kiwixmobile/extensions/ViewExtensions.kt
#	app/src/main/java/org/kiwix/kiwixmobile/history/HistoryContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/history/HistoryModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/intro/IntroContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/intro/IntroModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/intro/IntroPresenter.java
#	app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageDelegate.kt
#	app/src/main/java/org/kiwix/kiwixmobile/language/adapter/LanguageListItem.kt
#	app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/Action.kt
#	app/src/main/java/org/kiwix/kiwixmobile/language/viewmodel/State.kt
#	app/src/main/java/org/kiwix/kiwixmobile/main/MainContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/main/MainModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/settings/SettingsContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/settings/SettingsPresenter.java
#	app/src/main/java/org/kiwix/kiwixmobile/utils/LanguageContainer.kt
#	app/src/main/java/org/kiwix/kiwixmobile/utils/UpdateUtils.java
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostCallbacks.java
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostContract.java
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostPresenter.java
#	app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/IpAddressCallbacks.java
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/BaseBroadcastReceiver.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ConnectivityBroadcastReceiver.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/DefaultLanguageProvider.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/KiloByte.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/NetworkState.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SimplePageChangeListener.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/SimpleTextListener.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ArticleCount.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/StorageObserver.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/adapter/BooksOnDiskAdapter.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/DeleteFiles.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/None.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/effects/StartMultiSelection.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/LibraryAdapter.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/LibraryListItem.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/base/AdapterDelegate.kt
#	app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/base/BaseViewHolder.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/KiwixViewModelFactory.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksAdapter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksPresenter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/data/DataSource.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/data/Repository.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/di/ViewModelKey.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ViewModelModule.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ContextExtensions.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/help/HelpAdapter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryAdapter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryPresenter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/intro/CustomViewPager.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/intro/IntroActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/intro/IntroPagerAdapter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/language/LanguageActivity.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/language/adapter/LanguageListViewHolder.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/language/viewmodel/LanguageViewModel.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/main/ConfirmationAlertDialogFragment.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/main/MainActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/main/MainPresenter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/main/OnSwipeTouchListener.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/newdb/entities/BookOnDiskEntity.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/newdb/entities/LanguageEntity.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/settings/PrefsFragment.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/settings/StorageCalculator.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/AlertDialogShower.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/AnimationUtils.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/ImageUtils.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/KiwixDialog.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/ServerUtils.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/utils/SharedPreferenceUtil.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/webserver/WebServerHelper.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/webserver/ZimHostActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/wifi_hotspot/HotspotNotificationManager.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/wifi_hotspot/HotspotService.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/Language.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BooksOnDiskListItem.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/adapter/BooksOnDiskViewHolder.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/effects/ShareFiles.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/LibraryViewHolder.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/base/AbsDelegateAdapter.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/library_view/adapter/base/AdapterDelegateManager.kt
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/FileItem.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/FileListAdapter.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/KiwixWifiP2pBroadcastReceiver.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/LocalFileTransferActivity.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/PeerGroupHandshakeAsyncTask.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/SenderDeviceAsyncTask.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/WifiDirectManager.java
#	core/src/main/java/org/kiwix/kiwixmobile/core/zim_manager/local_file_transfer/WifiPeerListAdapter.java
#	core/src/test/java/org/kiwix/kiwixmobile/core/language/adapter/LanguageDelegateTest.kt
#	core/src/test/java/org/kiwix/kiwixmobile/core/language/viewmodel/SaveLanguagesAndFinishTest.kt
#	core/src/test/java/org/kiwix/kiwixmobile/core/settings/StorageCalculatorTest.kt
#	core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
#	core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/fileselect_view/StorageObserverTest.kt
2019-10-01 16:17:36 +01:00
Sean Mac Gillicuddy
8b8764adbe cherry pick 3.0.4 2019-10-01 16:11:43 +01:00
Sean Mac Gillicuddy
11db4504f9 Redo copyright update 2019-10-01 15:52:42 +01:00
Sean Mac Gillicuddy
f5514cbd72 get instrumentation tests running successfully 2019-10-01 14:55:01 +01:00
Sean Mac Gillicuddy
26c203f287 correct core packaging, alter pre-commit hook and travis for multimodule build 2019-10-01 13:32:25 +01:00
Sean Mac Gillicuddy
449d47ca3f use buildSrcVersions to extract dependencies, correct pre-commit script 2019-09-30 14:38:10 +01:00
Seán Mac Gillicuddy
6d7368b752
Merge pull request #1536 from kiwix/release/3.0.4
Release/3.0.4 to Develop
2019-09-30 11:59:03 +01:00
Kelson
a10a587f8e
Merge pull request #1472 from kiwix/#1429-update-copyright-and-standardise
#1429 update copyright and standardise
2019-09-30 13:09:50 +03:00
Sean Mac Gillicuddy
66cbafda42 Merge branch 'master' into release/3.0.4 2019-09-30 11:02:37 +01:00
Sean Mac Gillicuddy
d7d46ec163 Merge remote-tracking branch 'origin/develop' into release/3.0.4 2019-09-30 10:58:56 +01:00
Seán Mac Gillicuddy
2b41745c7d
Merge pull request #1534 from kiwix/feature/macgills/#1533-npe-delete-cache-dir
#1533 allow nullable return
2019-09-30 10:58:22 +01:00
Seán Mac Gillicuddy
ee4c707942
Merge pull request #1521 from kiwix/feature/macgills/#1519-exception-opening-zim-file
#1519 JniKiwixException opening Zim file
2019-09-30 10:50:30 +01:00
Sean Mac Gillicuddy
03524b77a6 update changelog and bump version 2019-09-30 10:37:00 +01:00
Seán Mac Gillicuddy
3a189a8976
Merge pull request #1529 from kiwix/feature/macgills/#1527-security-exception
#1527 SecurityException FIleUtils
2019-09-30 10:22:58 +01:00
Sean Mac Gillicuddy
f834dfd516 #1533 allow nullable return 2019-09-30 10:15:11 +01:00
Justin Biggs
a08cee1eb9 #1429 resolved merge conflicts by removing deleted files 2019-09-28 09:52:47 -05:00
Seán Mac Gillicuddy
14d7fdf111
Merge pull request #1522 from kiwix/feature/macgills/#1520-illegal-argument-content-query
#1520 Catch IllegalArgumentException
2019-09-27 15:30:05 +01:00
Sean Mac Gillicuddy
8bb9bca68a Add custom module 2019-09-27 15:28:40 +01:00
Sean Mac Gillicuddy
73595a2a11 fix Build.ApplicationId issue 2019-09-27 14:45:49 +01:00
Sean Mac Gillicuddy
09449c4238 Move unit tests to core 2019-09-27 14:36:20 +01:00
Sean Mac Gillicuddy
f7c189dbf7 Get source files compiling 2019-09-27 14:34:04 +01:00
Sean Mac Gillicuddy
7e46a27840 move all source files to library 2019-09-27 13:53:42 +01:00
Sean Mac Gillicuddy
a9f1f8ef7b move all resources to core 2019-09-27 13:18:04 +01:00
Seán Mac Gillicuddy
f58e1891bc
Merge pull request #1530 from kiwix/feature/macgills/#1528-npe-main-activity
#1528 Null check view
2019-09-27 13:11:01 +01:00
Sean Mac Gillicuddy
feae2de5d2 create module core 2019-09-27 12:58:59 +01:00
Sean Mac Gillicuddy
7a98c76b44 #1528 Null check view 2019-09-27 09:57:35 +01:00
Sean Mac Gillicuddy
e22854f6f2 #1527 SecurityException FIleUtils 2019-09-27 09:44:51 +01:00
Seán Mac Gillicuddy
894949486d
Merge pull request #1525 from kiwix/kelson42-patch-1
Bump-up libkiwix to 8.1.0
2019-09-27 09:25:17 +01:00
Sean Mac Gillicuddy
9b4ca6cfaf #1520 review fixes 2019-09-27 09:15:14 +01:00
Sean Mac Gillicuddy
85b93e34bf #1519 review fixes 2019-09-27 09:08:17 +01:00
Kelson
29eea07669
Bump-up libkiwix to 8.1.0 2019-09-26 19:36:19 +02:00
Seán Mac Gillicuddy
420ecb6920
Merge pull request #1524 from kiwix/feature/macgills/#1523-local-file-list-rendering
#1523 Wrap content appropriately
2019-09-26 13:23:54 +01:00
Seán Mac Gillicuddy
1a1aa12959
Merge pull request #1518 from kiwix/feature/macgills/#1517-unsatisfied-jni-kiwix-searcher
#1517 Make JniSearcher Nullable
2019-09-26 11:56:32 +01:00
Seán Mac Gillicuddy
feca871c97
Merge pull request #1516 from kiwix/feature/macgills/#1514-missing-resource-exception
#1514 Catch MissingResourceException
2019-09-26 11:56:07 +01:00
Sean Mac Gillicuddy
2934c16d37 #1523 Wrap content appropriately 2019-09-26 11:47:18 +01:00
Sean Mac Gillicuddy
7fbbf842fd #1520 Catch IllegalArgumentException 2019-09-26 11:30:20 +01:00
Sean Mac Gillicuddy
9548333ea8 #1519 JniKiwixException opening Zim file 2019-09-26 11:17:37 +01:00
Sean Mac Gillicuddy
6735fbe987 #1517 Make JniSearcher Nullable 2019-09-26 11:00:43 +01:00
Sean Mac Gillicuddy
d26e82f90f #1514 Catch MissingResourceException 2019-09-26 10:37:35 +01:00
Justin Biggs
69cb5c3408 #1429 remove copyright from settings.properties file 2019-09-25 18:08:24 -05:00
Justin Biggs
67b17f5529 #1429 updated scope to use nifty rule 2019-09-24 19:44:00 -05:00
Justin Biggs
cc7ad7de4f #1429 add copyright scope and remove copyright remnant from .properties file 2019-09-23 19:54:06 -05:00
Seán Mac Gillicuddy
cca60df69f
Merge pull request #1508 from kiwix/release/3.0
Release/3.0 to develop
2019-09-23 16:25:14 +01:00
Seán Mac Gillicuddy
e0d5bd70ad
Merge pull request #1507 from kiwix/release/3.0
Release/3.0
3.0.3
2019-09-23 15:38:04 +01:00
Seán Mac Gillicuddy
f9e722f72f
Merge pull request #1506 from kiwix/iadeelzafar/manual-hotspot
Iadeelzafar/manual hotspot
2019-09-23 15:33:22 +01:00
Sean Mac Gillicuddy
32b349e5de Listen to hotspot state changes 2019-09-23 14:30:18 +01:00
Seán Mac Gillicuddy
04d6bb7a0d
Merge pull request #1505 from kiwix/feature/macgills/#1489-anr-select-storage
#1499 detect storage on IO thread
2019-09-23 13:30:06 +01:00
Sean Mac Gillicuddy
db7ce3b7ee Merge branch 'release/3.0' into iadeelzafar/manual-hotspot
# Conflicts:
#	app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostModule.java
#	app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
2019-09-23 13:01:52 +01:00