Drop @jvmoverloads

OG-C · Nov 6, 2019 · 5722a36 · 5722a36
1 parent 2b50e85
commit 5722a36
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 12 deletions.
diff --git a/app/src/main/java/com/github/shadowsocks/BaseService.kt b/app/src/main/java/com/github/shadowsocks/BaseService.kt
@@ -262,7 +262,6 @@ abstract class BaseService : Service()
 
 	}
 
-	@JvmOverloads
 	fun stopRunner(stopService: Boolean, msg: String? = null)
 	{
 		// clean up recevier
@@ -353,7 +352,6 @@ abstract class BaseService : Service()
 		return START_NOT_STICKY
 	}
 
-	@JvmOverloads
 	protected fun changeState(s: Int, msg: String? = null)
 	{
 		val handler = Handler(Looper.getMainLooper())

diff --git a/app/src/main/java/com/github/shadowsocks/BaseVpnService.kt b/app/src/main/java/com/github/shadowsocks/BaseVpnService.kt
@@ -385,7 +385,6 @@ abstract class BaseVpnService : VpnService()
 		return Service.START_NOT_STICKY
 	}
 
-	@JvmOverloads
 	protected fun changeState(s: Int, msg: String? = null)
 	{
 		val handler = Handler(Looper.getMainLooper())

diff --git a/app/src/main/java/com/github/shadowsocks/GuardedProcess.kt b/app/src/main/java/com/github/shadowsocks/GuardedProcess.kt
@@ -13,7 +13,6 @@ class GuardedProcess(private val cmd: List<String>)
 	private var process: Process? = null
 	private var isRestart = false
 
-	@JvmOverloads
 	fun start(onRestartCallback: (() -> Boolean)? = null): GuardedProcess
 	{
 		val semaphore = Semaphore(1)

diff --git a/app/src/main/java/com/github/shadowsocks/ProfileManagerActivity.kt b/app/src/main/java/com/github/shadowsocks/ProfileManagerActivity.kt
@@ -962,7 +962,6 @@ class ProfileManagerActivity : AppCompatActivity(), View.OnClickListener, Toolba
 			}
 		}
 
-		@JvmOverloads
 		fun updateText(txTotal: Long = 0, rxTotal: Long = 0, elapsedInput: Long = -1)
 		{
 			val builder = SpannableStringBuilder()
@@ -1189,7 +1188,6 @@ class ProfileManagerActivity : AppCompatActivity(), View.OnClickListener, Toolba
 			itemView.setOnLongClickListener(this)
 		}
 
-		@JvmOverloads
 		fun updateText(isShowUrl: Boolean = false)
 		{
 			val builder = SpannableStringBuilder()

diff --git a/app/src/main/java/com/github/shadowsocks/ServiceBoundContext.kt b/app/src/main/java/com/github/shadowsocks/ServiceBoundContext.kt
@@ -70,7 +70,6 @@ open class ServiceBoundContext(base: Context) : ContextWrapper(base), IBinder.De
 	{
 	}
 
-	@JvmOverloads
 	fun attachService(callback: IShadowsocksServiceCallback.Stub? = null)
 	{
 		this.callback = callback

diff --git a/app/src/main/java/com/github/shadowsocks/ServiceBoundService.kt b/app/src/main/java/com/github/shadowsocks/ServiceBoundService.kt
@@ -71,7 +71,6 @@ abstract class ServiceBoundService : Service(), IBinder.DeathRecipient
 	{
 	}
 
-	@JvmOverloads
 	fun attachService(callback: IShadowsocksServiceCallback.Stub? = null)
 	{
 		this.callback = callback

diff --git a/app/src/main/java/com/github/shadowsocks/ShadowsocksNotification.kt b/app/src/main/java/com/github/shadowsocks/ShadowsocksNotification.kt
@@ -9,7 +9,7 @@ import com.github.shadowsocks.aidl.*
 import com.github.shadowsocks.utils.*
 import java.util.*
 
-class ShadowsocksNotification @JvmOverloads constructor(private val service: Service, private val profileName: String, private val visible: Boolean = false)
+class ShadowsocksNotification constructor(private val service: Service, private val profileName: String, private val visible: Boolean = false)
 {
 	private val callback by lazy {
 		object : IShadowsocksServiceCallback.Stub()

diff --git a/app/src/main/java/com/github/shadowsocks/database/ProfileManager.kt b/app/src/main/java/com/github/shadowsocks/database/ProfileManager.kt
@@ -107,7 +107,6 @@ class ProfileManager(private val dbHelper: DBHelper)
 	/**
 	 * create profile
 	 */
-	@JvmOverloads
 	fun createProfile(p: Profile? = null): Profile
 	{
 		val profile: Profile = p ?: Profile()

diff --git a/app/src/main/java/com/github/shadowsocks/network/request/RequestHelper.kt b/app/src/main/java/com/github/shadowsocks/network/request/RequestHelper.kt
@@ -271,7 +271,6 @@ private constructor(builder: OkHttpClient.Builder? = null)
 		 *
 		 * @param builder client builder object
 		 */
-		@JvmOverloads
 		fun init(builder: OkHttpClient.Builder? = null)
 		{
 			if (sInstance == null)

diff --git a/app/src/main/java/com/github/shadowsocks/utils/Utils.kt b/app/src/main/java/com/github/shadowsocks/utils/Utils.kt
@@ -230,7 +230,6 @@ object Utils
 	 * @param file    file
 	 * @param content string content
 	 */
-	@JvmOverloads //TODO: Drop Java
 	fun printToFile(file: File, content: String, isPrintln: Boolean = false)
 	{
 		var p: PrintWriter? = null
-Original file line number
+Diff line change
@@ Expand Up @@
     	{
     	}
-    	@JvmOverloads
     	fun attachService(callback: IShadowsocksServiceCallback.Stub? = null)
     	{
     		this.callback = callback
@@ Expand Down @@