From 2c2e5790f5a323375f1c386fe8d498386f805efb Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Thu, 5 May 2016 20:04:03 +0800
Subject: [PATCH] Fix typo: deattach => detach

I can't believe I've been so blind.
---
 .../scala/com/github/shadowsocks/ProfileManagerActivity.scala   | 2 +-
 src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala | 2 +-
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala         | 2 +-
 .../com/github/shadowsocks/ShadowsocksDeathRecipient.scala      | 2 +-
 .../com/github/shadowsocks/ShadowsocksRunnerActivity.scala      | 2 +-
 .../scala/com/github/shadowsocks/ShadowsocksRunnerService.scala | 2 +-
 src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
index 6898716a..52401d76 100644
--- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
@@ -363,7 +363,7 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
   }
 
   override def onDestroy {
-    deattachService()
+    detachService()
     undoManager.flush
     ShadowsocksApplication.profileManager.setProfileAddedListener(null)
     super.onDestroy
diff --git a/src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala b/src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
index ec2367a8..d5b57400 100644
--- a/src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
+++ b/src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
@@ -62,7 +62,7 @@ trait ServiceBoundContext extends Context {
     }
   }
 
-  def deattachService() {
+  def detachService() {
     unregisterCallback
     callback = null
     if (connection != null) {
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index a149cc92..5da9245c 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -554,7 +554,7 @@ class Shadowsocks
   override def onDestroy() {
     super.onDestroy()
     _isDestroyed = true
-    deattachService()
+    detachService()
     new BackupManager(this).dataChanged()
     handler.removeCallbacksAndMessages(null)
   }
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
index 5d3ab775..379593da 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksDeathRecipient.scala
@@ -15,7 +15,7 @@ class ShadowsocksDeathRecipient(val mContext: ServiceBoundContext)
     Log.d(TAG, "[ShadowsocksDeathRecipient] binder died.")
     mContext match {
       case ss: Shadowsocks =>
-        ss.deattachService
+        ss.detachService
         ss.crashRecovery
         ss.attachService
       case _ =>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
index 869a5ad0..6c2530eb 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerActivity.scala
@@ -90,7 +90,7 @@ class ShadowsocksRunnerActivity extends Activity with ServiceBoundContext {
 
   override def onDestroy() {
     super.onDestroy()
-    deattachService()
+    detachService()
     if (receiver != null) {
       unregisterReceiver(receiver)
       receiver = null
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala
index 721d46a8..1c779ca1 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksRunnerService.scala
@@ -77,6 +77,6 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext {
 
   override def onDestroy() {
     super.onDestroy()
-    deattachService()
+    detachService()
   }
 }
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
index 7e1dde30..fe136fb5 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
@@ -132,7 +132,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
   def onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) = key match {
     case Key.isNAT =>
       activity.handler.post(() => {
-        activity.deattachService
+        activity.detachService
         activity.attachService
       })
     case _ =>