first run setup fix

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f593631..a5281fc 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -72,9 +72,9 @@
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/syncadapter_files"/>
         </service>
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/syncadapter_files"/>
         </service>

-         <provider android:name="cp" android:enabled="true" android:syncable="true" android:exported="false" android:label="@string/sync_string_files" android:authorities="org.owncloud.files"></provider>
+         <provider android:name="cp" android:enabled="true" android:syncable="true" android:exported="false" android:authorities="org.owncloud" android:label="@string/sync_string_files"></provider>

          <activity android:name=".authenticator.AuthenticatorActivity"></activity>
          <activity android:name=".authenticator.AuthenticatorActivity"></activity>

-         <provider android:label="@string/sync_string_contacts" android:name="cp2" android:syncable="true" android:enabled="true" android:exported="false" android:authorities="org.owncloud.contacts"></provider>
+         <provider android:label="@string/sync_string_contacts" android:name="cp2" android:syncable="true" android:enabled="true" android:exported="false" android:authorities=""></provider>

          <service android:name=".syncadapter.ContactSyncService" android:exported="true">
              <intent-filter>
                  <action android:name="android.content.SyncAdapter"></action>
          <service android:name=".syncadapter.ContactSyncService" android:exported="true">
              <intent-filter>
                  <action android:name="android.content.SyncAdapter"></action>

diff --git a/res/xml/syncadapter_files.xml b/res/xml/syncadapter_files.xml
index 99c06d8..3285ea8 100644 (file)
--- a/res/xml/syncadapter_files.xml
+++ b/res/xml/syncadapter_files.xml
@@ -21,7 +21,7 @@
 <!-- for the SyncAdapter. -->
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
 <!-- for the SyncAdapter. -->
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"

-    android:contentAuthority="org.owncloud.files"
+    android:contentAuthority="org.owncloud"

     android:accountType="owncloud"
     android:supportsUploading="true"
 />
     android:accountType="owncloud"
     android:supportsUploading="true"
 />

diff --git a/src/eu/alefzero/owncloud/OwnCloudMainScreen.java b/src/eu/alefzero/owncloud/OwnCloudMainScreen.java
index 0b37f2d..2eb478a 100644 (file)
--- a/src/eu/alefzero/owncloud/OwnCloudMainScreen.java
+++ b/src/eu/alefzero/owncloud/OwnCloudMainScreen.java
@@ -312,7 +312,6 @@ public class OwnCloudMainScreen extends ListActivity {
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);

-    Log.i("asd", data+"");

   }
   
   @Override
   }
   
   @Override

diff --git a/src/eu/alefzero/owncloud/db/ProviderMeta.java b/src/eu/alefzero/owncloud/db/ProviderMeta.java
index 762562d..d5d86ca 100644 (file)
--- a/src/eu/alefzero/owncloud/db/ProviderMeta.java
+++ b/src/eu/alefzero/owncloud/db/ProviderMeta.java
@@ -22,7 +22,7 @@ import android.provider.BaseColumns;
 
 public class ProviderMeta {
 
 
 public class ProviderMeta {
 

-  public static final String AUTHORITY_FILES = "org.owncloud.files";
+  public static final String AUTHORITY_FILES = "org.owncloud";

   public static final String DB_FILE = "owncloud.db";
   public static final String DB_NAME = "filelist";
   public static final int DB_VERSION = 1;
   public static final String DB_FILE = "owncloud.db";
   public static final String DB_NAME = "filelist";
   public static final int DB_VERSION = 1;

diff --git a/src/eu/alefzero/owncloud/syncadapter/ContactSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/ContactSyncAdapter.java
index d63b656..61564d5 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/ContactSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/ContactSyncAdapter.java
@@ -52,7 +52,6 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
                         cursor.getColumnIndex(ContactsContract.Contacts._ID));
                 String lookup = cursor.getString(
                         cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));
                         cursor.getColumnIndex(ContactsContract.Contacts._ID));
                 String lookup = cursor.getString(
                         cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));

-                Log.d(TAG, "Found Contact id: " + id + " with lookupkey: "+lookup);

 
                 try {
                     FileInputStream fis = getContactVcard(lookup);
 
                 try {
                     FileInputStream fis = getContactVcard(lookup);


@@ -65,12 +64,10 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
                         lookup+
                         ".vcf"
                     );
                         lookup+
                         ".vcf"
                     );

-                    

                     byte[] b = new byte[fis.available()];
                     fis.read(b);
                     query.setEntity(new ByteArrayEntity(b));
                     HttpResponse response = fireRawRequest(query);
                     byte[] b = new byte[fis.available()];
                     fis.read(b);
                     query.setEntity(new ByteArrayEntity(b));
                     HttpResponse response = fireRawRequest(query);

-                    

                     if(201 != response.getStatusLine().getStatusCode()) {
                         syncResult.stats.numIoExceptions++;
                     }
                     if(201 != response.getStatusLine().getStatusCode()) {
                         syncResult.stats.numIoExceptions++;
                     }


@@ -88,7 +85,6 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 }
             }
         }
                 }
             }
         }

-

     }
 
     protected Uri getUri() {
     }
 
     protected Uri getUri() {