mirror of
https://github.com/gedoor/legado.git
synced 2024-07-02 23:17:32 +08:00
parent
06d486c96c
commit
2aed021e08
|
@ -96,12 +96,11 @@ class WebService : BaseService() {
|
|||
if (addressList.any()) {
|
||||
notificationList.addAll(addressList.map { address -> getString(R.string.http_ip, address.hostAddress, getPort()) })
|
||||
hostAddress = notificationList.first()
|
||||
startForegroundNotification()
|
||||
} else {
|
||||
hostAddress = getString(R.string.network_connection_unavailable)
|
||||
notificationList.add(hostAddress)
|
||||
startForegroundNotification()
|
||||
}
|
||||
startForegroundNotification()
|
||||
postEvent(EventBus.WEB_SERVICE, hostAddress)
|
||||
}
|
||||
}
|
||||
|
@ -184,6 +183,7 @@ class WebService : BaseService() {
|
|||
*/
|
||||
override fun startForegroundNotification() {
|
||||
val builder = NotificationCompat.Builder(this, AppConst.channelIdWeb)
|
||||
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
||||
.setSmallIcon(R.drawable.ic_web_service_noti)
|
||||
.setOngoing(true)
|
||||
.setContentTitle(getString(R.string.web_service))
|
||||
|
@ -196,7 +196,6 @@ class WebService : BaseService() {
|
|||
getString(R.string.cancel),
|
||||
servicePendingIntent<WebService>(IntentAction.stop)
|
||||
)
|
||||
builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
|
||||
val notification = builder.build()
|
||||
startForeground(NotificationId.WebService, notification)
|
||||
}
|
||||
|
|
|
@ -194,10 +194,10 @@ object NetworkUtils {
|
|||
enumeration = NetworkInterface.getNetworkInterfaces()
|
||||
} catch (e: SocketException) {
|
||||
e.printOnDebug()
|
||||
return mutableListOf()
|
||||
return emptyList()
|
||||
}
|
||||
|
||||
var fallbackAddress: MutableList<InetAddress> = mutableListOf()
|
||||
val addressList = mutableListOf<InetAddress>()
|
||||
|
||||
while (enumeration.hasMoreElements()) {
|
||||
val nif = enumeration.nextElement()
|
||||
|
@ -205,13 +205,11 @@ object NetworkUtils {
|
|||
while (addresses.hasMoreElements()) {
|
||||
val address = addresses.nextElement()
|
||||
if (!address.isLoopbackAddress && isIPv4Address(address.hostAddress)) {
|
||||
if (nif.name?.startsWith("wlan") == true) {
|
||||
fallbackAddress.add(address)
|
||||
}
|
||||
addressList.add(address)
|
||||
}
|
||||
}
|
||||
}
|
||||
return fallbackAddress
|
||||
return addressList
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user