mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-24 05:04:50 -04:00
Merge branch 'develop' into iadeelzafar/wifi-hotspot
This commit is contained in:
commit
3b5c230ed7
27
.github/move.yml
vendored
Normal file
27
.github/move.yml
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
# Configuration for Move Issues - https://github.com/dessant/move-issues
|
||||
|
||||
# Delete the command comment when it contains no other content
|
||||
deleteCommand: true
|
||||
|
||||
# Close the source issue after moving
|
||||
closeSourceIssue: true
|
||||
|
||||
# Lock the source issue after moving
|
||||
lockSourceIssue: false
|
||||
|
||||
# Mention issue and comment authors
|
||||
mentionAuthors: true
|
||||
|
||||
# Preserve mentions in the issue content
|
||||
keepContentMentions: true
|
||||
|
||||
# Move labels that also exist on the target repository
|
||||
moveLabels: true
|
||||
|
||||
# Set custom aliases for targets
|
||||
# aliases:
|
||||
# r: repo
|
||||
# or: owner/repo
|
||||
|
||||
# Repository to extend settings from
|
||||
# _extends: repo
|
@ -45,7 +45,7 @@ class HistoryDao @Inject constructor(val box: Box<HistoryEntity>) {
|
||||
fun getHistoryList(showHistoryCurrentBook: Boolean) = box
|
||||
.query {
|
||||
if (showHistoryCurrentBook) {
|
||||
equal(HistoryEntity_.zimFilePath, ZimContentProvider.getZimFile())
|
||||
equal(HistoryEntity_.zimFilePath, ZimContentProvider.getZimFile() ?: "")
|
||||
}
|
||||
orderDesc(HistoryEntity_.timeStamp)
|
||||
}
|
||||
|
@ -38,6 +38,7 @@ import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTra
|
||||
/**
|
||||
* Manager for the Wifi-P2p API, used in the local file transfer module
|
||||
*/
|
||||
@SuppressWarnings("MissingPermission")
|
||||
public class WifiDirectManager
|
||||
implements WifiP2pManager.ChannelListener, WifiP2pManager.PeerListListener,
|
||||
WifiP2pManager.ConnectionInfoListener,
|
||||
|
Loading…
x
Reference in New Issue
Block a user