projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
syncadapter
/
FileSyncAdapter.java
diff --git
a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index
83ed2be
..
c550eaa
100644
(file)
--- a/
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@
-51,7
+51,7
@@
import android.content.Context;
import android.content.Intent;
import android.content.SyncResult;
import android.os.Bundle;
import android.content.Intent;
import android.content.SyncResult;
import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+
//
import android.support.v4.content.LocalBroadcastManager;
/**
* Implementation of {@link AbstractThreadedSyncAdapter} responsible for synchronizing
/**
* Implementation of {@link AbstractThreadedSyncAdapter} responsible for synchronizing
@@
-368,8
+368,8
@@
public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
if (result != null) {
intent.putExtra(FileSyncAdapter.EXTRA_RESULT, result);
}
if (result != null) {
intent.putExtra(FileSyncAdapter.EXTRA_RESULT, result);
}
-
//getContext().sendStickyBroadcast(i
);
- LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
+
getContext().sendStickyBroadcast(intent
);
+
//
LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
}
}