Merge branch 'develop' into iadeelzafar/wifi-hotspot

This commit is contained in:
Adeel 2019-08-22 15:18:20 +05:00
commit 3b5c230ed7
3 changed files with 29 additions and 1 deletions

27
.github/move.yml vendored Normal file
View 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

View File

@ -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)
}

View File

@ -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,