AuthenticatorActivity is bound to OperationsService when created

[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 e5e8014..6ff9f6a 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -25,8 +25,11 @@ import android.accounts.AccountManager;
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.app.ProgressDialog;\r

+import android.content.ComponentName;\r
+import android.content.Context;\r

 import android.content.DialogInterface;\r
 import android.content.Intent;\r
 import android.content.DialogInterface;\r
 import android.content.Intent;\r

+import android.content.ServiceConnection;\r

 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r
 import android.content.SharedPreferences;\r
 import android.graphics.Rect;\r
 import android.graphics.drawable.Drawable;\r


@@ -34,6 +37,7 @@ import android.net.Uri;
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.net.http.SslError;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r

+import android.os.IBinder;\r

 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.preference.PreferenceManager;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r


@@ -54,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.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
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.MainApp;\r


@@ -76,6 +81,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 \r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 \r

+import com.owncloud.android.services.OperationsService;\r
+import com.owncloud.android.services.OperationsService.OperationsServiceBinder;\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r


@@ -140,6 +147,9 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
     private int mAuthStatusText, mAuthStatusIcon;    \r
     private TextView mAuthStatusLayout;\r
 \r
     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
     private final Handler mHandler = new Handler();\r
     private Thread mOperationThread;\r
     private GetRemoteStatusOperation mOcServerChkOperation;\r


@@ -191,6 +201,32 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         super.onCreate(savedInstanceState);\r
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
 \r
         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
         /// set view and get references to view elements\r
         setContentView(R.layout.account_setup);\r
         mAuthMessage = (TextView) findViewById(R.id.auth_message);\r


@@ -525,6 +561,16 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         mJustCreated = false;\r
 \r
     }\r
         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
 \r
 \r
     /**\r