Merge remote-tracking branch 'origin/operations_service' into operations_service

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 255ed80..638b5dd 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -58,6 +58,7 @@ import android.widget.CheckBox;
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r
+import android.widget.Toast;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r
@@ -146,6 +147,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r
+    private ServiceConnection mOperationsConnection = null;\r
+    private OperationsServiceBinder mOperationsBinder = null;\r
+    \r
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private GetRemoteStatusOperation mOcServerChkOperation;\r
@@ -199,6 +203,32 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
+        // bind to Operations Service\r
+        mOperationsConnection = new ServiceConnection() {\r
+\r
+            @Override\r
+            public void onServiceConnected(ComponentName name, IBinder service) {\r
+                Log_OC.d(TAG, "Operations service connected");\r
+                mOperationsBinder = (OperationsServiceBinder) service;\r
+            }\r
+\r
+            @Override\r
+            public void onServiceDisconnected(ComponentName name) {\r
+                Log_OC.d(TAG, "Operations service crashed");\r
+                mOperationsBinder = null;\r
+            }\r
+            \r
+        };\r
+        if (!bindService(new Intent(this, OperationsService.class), \r
+                        mOperationsConnection, \r
+                        Context.BIND_AUTO_CREATE)) {\r
+            Toast.makeText(this, \r
+                    R.string.error_cant_bind_to_operations_service, \r
+                    Toast.LENGTH_LONG)\r
+                        .show();\r
+            finish();\r
+        }\r
+\r
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r
@@ -536,6 +566,16 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         mJustCreated = false;\r
 \r
     }\r
+    \r
+    \r
+    @Override\r
+    protected void onDestroy() {\r
+        if (mOperationsConnection != null) {\r
+            unbindService(mOperationsConnection);\r
+            mOperationsBinder = null;\r
+        }\r
+        super.onDestroy();\r
+    }\r
 \r
 \r
     /**\r