зеркало из https://github.com/nextcloud/android.git
first run setup fix
This commit is contained in:
Родитель
b2dc291653
Коммит
8f9a9a8694
|
@ -72,9 +72,9 @@
|
|||
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>
|
||||
<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>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<!-- 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"
|
||||
/>
|
||||
|
|
|
@ -312,7 +312,6 @@ public class OwnCloudMainScreen extends ListActivity {
|
|||
@Override
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
Log.i("asd", data+"");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -22,7 +22,7 @@ import android.provider.BaseColumns;
|
|||
|
||||
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;
|
||||
|
|
|
@ -52,7 +52,6 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
|
|||
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);
|
||||
|
@ -65,12 +64,10 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
|
|||
lookup+
|
||||
".vcf"
|
||||
);
|
||||
|
||||
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++;
|
||||
}
|
||||
|
@ -88,7 +85,6 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected Uri getUri() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче