brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine code style again

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
detekt.yml
View File

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

3
mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
View File

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

5
mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt
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.None -> { } // nothing to be done here
MasqueradeMode.Simple -> { MasqueradeMode.Simple -> {
// note: specifying -i wouldn't work for POSTROUTING // note: specifying -i wouldn't work for POSTROUTING
iptablesAdd(if (upstream == null) "vpnhotspot_masquerade -s $hostSubnet -j MASQUERADE" else iptablesAdd(if (upstream == null) {
"vpnhotspot_masquerade -s $hostSubnet -o $upstream -j MASQUERADE", "nat") "vpnhotspot_masquerade -s $hostSubnet -j MASQUERADE"
} else "vpnhotspot_masquerade -s $hostSubnet -o $upstream -j MASQUERADE", "nat")
} }
MasqueradeMode.Netd -> { MasqueradeMode.Netd -> {
check(upstream != null) // fallback is only needed for repeater on API 23 < 28 check(upstream != null) // fallback is only needed for repeater on API 23 < 28