complete two way synchronization

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 5956004..53b6aed 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -40,6 +40,7 @@ import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

+import android.os.Environment;\r

 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r


@@ -65,7 +66,10 @@ import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r

+import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
+import com.owncloud.android.files.OwnCloudFileObserver;\r

 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileDownloader;\r

+import com.owncloud.android.files.services.FileObserverService;\r

 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r


@@ -108,12 +112,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final String TAG = "FileDisplayActivity";\r
     \r
     \r
     private static final String TAG = "FileDisplayActivity";\r
     \r

-    \r

     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r

-\r
+        \r

         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         /// saved instance state: keep this always before initDataFromCurrentAccount()\r
         Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
 \r
         /// saved instance state: keep this always before initDataFromCurrentAccount()\r


@@ -137,6 +140,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             requestPinCode();\r
         }\r
 \r
             requestPinCode();\r
         }\r
 \r

+        // file observer\r
+        Intent observer_intent = new Intent(this, FileObserverService.class);\r
+        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
+        startService(observer_intent);\r

             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r