Refine code style again

This commit is contained in:
Mygod
2020-08-04 04:19:30 +08:00
parent ba80e922b8
commit e333c859df
3 changed files with 8 additions and 10 deletions

View File

@@ -151,8 +151,7 @@ formatting:
android: true
autoCorrect: true
AnnotationOnSeparateLine:
active: true
autoCorrect: true
active: false
ChainWrapping:
active: true
autoCorrect: true
@@ -172,10 +171,7 @@ formatting:
autoCorrect: true
layout: 'idea'
Indentation:
active: true
autoCorrect: true
indentSize: 4
continuationIndentSize: 4
active: false
MaximumLineLength:
active: false
ModifierOrdering:

View File

@@ -105,8 +105,9 @@ class ClientsFragment : Fragment() {
receive = -1
}
override fun toString() = if (send < 0 || receive < 0) "" else
"${Formatter.formatFileSize(app, send)}/s\t\t${Formatter.formatFileSize(app, receive)}/s"
override fun toString() = if (send < 0 || receive < 0) "" else {
"${Formatter.formatFileSize(app, send)}/s\t\t${Formatter.formatFileSize(app, receive)}/s"
}
}
private inner class ClientViewHolder(parent: ViewGroup, val binding: ListitemClientBinding =

View File

@@ -162,8 +162,9 @@ class Routing(private val caller: Any, private val downstream: String) : IpNeigh
MasqueradeMode.None -> { } // nothing to be done here
MasqueradeMode.Simple -> {
// note: specifying -i wouldn't work for POSTROUTING
iptablesAdd(if (upstream == null) "vpnhotspot_masquerade -s $hostSubnet -j MASQUERADE" else
"vpnhotspot_masquerade -s $hostSubnet -o $upstream -j MASQUERADE", "nat")
iptablesAdd(if (upstream == null) {
"vpnhotspot_masquerade -s $hostSubnet -j MASQUERADE"
} else "vpnhotspot_masquerade -s $hostSubnet -o $upstream -j MASQUERADE", "nat")
}
MasqueradeMode.Netd -> {
check(upstream != null) // fallback is only needed for repeater on API 23 < 28