Merge pull request #4 from MozCloudStorage/cloud

CloudStorageManager and VolumeManager integration.
MozCloudStorage · May 13, 2015 · 6411dda · 6411dda
2 parents 1fbc5f1 + 36cc737
commit 6411dda
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/dom/system/gonk/VolumeManager.cpp b/dom/system/gonk/VolumeManager.cpp
@@ -155,6 +155,21 @@ VolumeManager::FindAddVolumeByName(const nsCSubstring& aName)
   return vol;
 }
 
+//static
+void
+VolumeManager::RemoveVolumeByName(const nsCSubstring& aName)
+{
+  VolumeArray::size_type  numVolumes = NumVolumes();
+  VolumeArray::index_type volIndex;
+  for (volIndex = 0; volIndex < numVolumes; volIndex++) {
+    RefPtr<Volume> vol = GetVolume(volIndex);
+    if (vol->Name().Equals(aName)) {
+      break;
+    }
+  }
+  sVolumeManager->mVolumeArray.RemoveElementAt(volIndex);
+}
+
 //static
 void VolumeManager::InitConfig()
 {

diff --git a/dom/system/gonk/VolumeManager.h b/dom/system/gonk/VolumeManager.h
@@ -128,6 +128,7 @@ class VolumeManager final : public MessageLoopForIO::LineWatcher
   static TemporaryRef<Volume> GetVolume(VolumeArray::index_type aIndex);
   static TemporaryRef<Volume> FindVolumeByName(const nsCSubstring& aName);
   static TemporaryRef<Volume> FindAddVolumeByName(const nsCSubstring& aName);
+  static void RemoveVolumeByName(const nsCSubstring& aName);
   static void InitConfig();
 
   static void       PostCommand(VolumeCommand* aCommand);

diff --git a/dom/system/gonk/cloudstorage/CloudStorage.cpp b/dom/system/gonk/cloudstorage/CloudStorage.cpp
@@ -30,18 +30,19 @@ class CloudStorageRunnable : public nsRunnable
   { 
     CloudStorageRequestHandler* handler = new CloudStorageRequestHandler(mCloudStorage->MountPoint());
     if (handler) {
-      /*
       RefPtr<Volume> vol = VolumeManager::FindAddVolumeByName(mCloudStorage->Name());
-      vol->SetCloudVolume(mCloudStorage->MountPoint());
-      */
+      vol->SetFakeVolume(mCloudStorage->MountPoint());
+      VolumeManager::Dump("CloudStorage");
       while (mCloudStorage->State() == CloudStorage::STATE_RUNNING) {
         //handler->HandleOneRequest();
 	sleep(1);
       }
     } else {
       LOG("Construct cloud storage handler fail");
     }
+    VolumeManager::RemoveVolumeByName(mCloudStorage->Name());
     delete handler;
+    VolumeManager::Dump("CloudStorage");
     LOG("going to finish RequestHandler.");
     return NS_OK;
   }