From b41c8e74234a35f05999887e4451e1805a7d8989 Mon Sep 17 00:00:00 2001
From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Fri, 6 Nov 2015 08:47:11 +0100
Subject: [PATCH] [File] Always return information about available system
 paths.

[Verification] Code compiles.

Change-Id: Id99dd7df58df1081b25582892ceeb57390d4ad6e
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---
 src/file/js/fileSystemPaths.js | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/file/js/fileSystemPaths.js b/src/file/js/fileSystemPaths.js
index 95c2452..80bdba4 100644
--- a/src/file/js/fileSystemPaths.js
+++ b/src/file/js/fileSystemPaths.js
@@ -25,38 +25,49 @@ var pathsPrefix = {
   sharedDirectory: '/opt/usr/media/',
 };
 
-function setExternalStorage(successCallback, errorCallback) {
+function setExternalStorage(callback) {
   var onSuccess = function(storages) {
-    for (var i = 0; i < storages.length; i++) {
+    for (var i = 0; i < storages.length; ++i) {
       if (storages[i].type === 'EXTERNAL' && storages[i].state === 'MOUNTED') {
         pathsPrefix.externalRootDirectory = storages[i].label + '/';
-        successCallback && successCallback(pathsPrefix);
-        return;
+        break;
       }
     }
+
+    callback(pathsPrefix);
   }
 
   var onError = function(error) {
-    console.error("Failed to get external storage: " + error.message);
-    errorCallback && errorCallback(ConvErrorCode(error.code));
+    console.error('Failed to get external storage: ' + error.message);
+    callback(pathsPrefix);
   }
 
-  tizen.filesystem.listStorages(onSuccess, onError);
+  try {
+    tizen.filesystem.listStorages(onSuccess, onError);
+  } catch(error) {
+    console.error('Failed to list storages: ' + error.message);
+    callback(pathsPrefix);
+  }
 }
 
-function setApplicationStorageDirectory(successCallback, errorCallback) {
+function setApplicationStorageDirectory(callback) {
   try {
     var app = tizen.application.getCurrentApplication();
     pathsPrefix.applicationStorageDirectory = '/opt/usr/apps/' + app.appInfo.packageId + '/';
-    setExternalStorage(successCallback, errorCallback);
+    setExternalStorage(callback);
   } catch(error) {
-    errorCallback && errorCallback(ConvErrorCode(error.code));
+    console.error('Failed to get current application: ' + error.message);
+    callback(pathsPrefix);
   }
 }
 
 module.exports = {
   requestAllPaths: function(successCallback, errorCallback, args) {
-    setApplicationStorageDirectory(successCallback, errorCallback);
+    // we ignore errorCallback here, as we're always reporting as much
+    // information as we currently have
+    setApplicationStorageDirectory(function(r) {
+      successCallback && successCallback(r);
+    });
   }
 };
 
-- 
2.7.4