Skip to content

Commit 088ea9f

Browse files
Merge pull request #358 from nextcloud/syncedFolders
Auto Upload (Android 7+)
2 parents 7260f5b + 93e861c commit 088ea9f

File tree

77 files changed

+3320
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+3320
-139
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ tests/proguard-project.txt
3131
.gradle
3232
.idea
3333
*.iml
34-
build
34+
build
35+
/gradle.properties

β€ŽAndroidManifest.xmlβ€Ž

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@
7777
</activity>
7878
<activity android:name=".ui.activity.ManageAccountsActivity" />
7979
<activity android:name=".ui.activity.ParticipateActivity" />
80+
<activity android:name=".ui.activity.FolderSyncActivity" />
8081
<activity android:name=".ui.activity.UploadFilesActivity" />
8182
<activity android:name=".ui.activity.ReceiveExternalFilesActivity"
83+
8284
android:taskAffinity=""
8385
android:excludeFromRecents="true"
8486
android:theme="@style/Theme.ownCloud.NoActionBar">
@@ -122,6 +124,7 @@
122124
android:name="android.accounts.AccountAuthenticator"
123125
android:resource="@xml/authenticator" />
124126
</service>
127+
<service android:name=".services.observer.SyncedFolderObserverService"/>
125128
<service
126129
android:name=".syncadapter.FileSyncService"
127130
android:exported="true" >
@@ -133,6 +136,10 @@
133136
android:name="android.content.SyncAdapter"
134137
android:resource="@xml/syncadapter_files" />
135138
</service>
139+
<service
140+
android:name=".services.SyncedFolderJobService"
141+
android:permission="android.permission.BIND_JOB_SERVICE"
142+
android:exported="true"/>
136143

137144
<provider
138145
android:name=".providers.FileContentProvider"
412 Bytes
820 Bytes
920 Bytes
1.02 KB
619 Bytes
772 Bytes
260 Bytes
284 Bytes

0 commit comments

Comments
Β (0)