Fixed minor bugs inserted in clean-up

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ea0c1aa..745d09f 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -88,7 +88,7 @@
         </activity>\r
 \r
         <service\r
         </activity>\r
 \r
         <service\r

-            android:name=".authenticator.AccountAuthenticatorService"\r
+            android:name=".authentication.AccountAuthenticatorService"\r

             android:exported="true">\r
             <intent-filter  android:priority="100">\r
                 <action android:name="android.accounts.AccountAuthenticator" />\r
             android:exported="true">\r
             <intent-filter  android:priority="100">\r
                 <action android:name="android.accounts.AccountAuthenticator" />\r


@@ -120,7 +120,7 @@
         </provider>\r
 \r
         <activity\r
         </provider>\r
 \r
         <activity\r

-            android:name=".ui.activity.AuthenticatorActivity"\r
+            android:name=".authentication.AuthenticatorActivity"\r

             android:exported="true"\r
             android:theme="@style/Theme.ownCloud.noActionBar" \r
             android:launchMode="singleTask">\r
             android:exported="true"\r
             android:theme="@style/Theme.ownCloud.noActionBar" \r
             android:launchMode="singleTask">\r


@@ -166,9 +166,6 @@
         </receiver>\r
         <service android:name=".files.services.FileObserverService"/>\r
         \r
         </receiver>\r
         <service android:name=".files.services.FileObserverService"/>\r
         \r

-        <service android:name=".authenticator.oauth2.services.OAuth2GetTokenService" >\r
-        </service>\r
-        

     </application>\r
 \r
 </manifest>
     </application>\r
 \r
 </manifest>

diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
index fbbe254..b64ebce 100644 (file)
--- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
+++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
@@ -62,7 +62,7 @@ public class OAuth2GetAccessToken extends RemoteOperation {
             }
             
             if (result == null) { 
             }
             
             if (result == null) { 

-                NameValuePair[] nameValuePairs = new NameValuePair[5];
+                NameValuePair[] nameValuePairs = new NameValuePair[4];

                 nameValuePairs[0] = new NameValuePair(OAuth2Constants.KEY_GRANT_TYPE, mGrantType);
                 nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CODE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_CODE));            
                 nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri);       
                 nameValuePairs[0] = new NameValuePair(OAuth2Constants.KEY_GRANT_TYPE, mGrantType);
                 nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CODE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_CODE));            
                 nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri);