Merge pull request #133 from jmpascal/master

[QA Fix]
Alfresco · Jul 22, 2013 · c5d84d8 · c5d84d8
2 parents d9ed165 + e3282b6
commit c5d84d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...oid/src/org/alfresco/mobile/android/application/fragments/properties/DetailsFragment.java b/...oid/src/org/alfresco/mobile/android/application/fragments/properties/DetailsFragment.java
@@ -828,6 +828,7 @@ public void openin()
         if (syncManager.isSynced(SessionUtils.getAccount(getActivity()), node))
         {
             final File syncFile = syncManager.getSyncFile(acc, node);
+            if (syncFile == null) { return; }
             long datetime = syncFile.lastModified();
             setDownloadDateTime(new Date(datetime));
 

diff --git a/...oid/src/org/alfresco/mobile/android/application/fragments/properties/PreviewFragment.java b/...oid/src/org/alfresco/mobile/android/application/fragments/properties/PreviewFragment.java
@@ -149,6 +149,7 @@ public void openin()
         if (syncManager.isSynced(SessionUtils.getAccount(getActivity()), node))
         {
             final File syncFile = syncManager.getSyncFile(acc, node);
+            if (syncFile == null) { return; }
             long datetime = syncFile.lastModified();
             detailsFragment.setDownloadDateTime(new Date(datetime));
 

diff --git a/...e-android/src/org/alfresco/mobile/android/application/operations/sync/SynchroManager.java b/...e-android/src/org/alfresco/mobile/android/application/operations/sync/SynchroManager.java
@@ -616,7 +616,7 @@ public boolean isSynced(Account account, String nodeIdentifier)
                 SynchroProvider.getAccountFilter(account) + " AND " + SynchroSchema.COLUMN_NODE_ID + " LIKE '"
                         + NodeRefUtils.getCleanIdentifier(nodeIdentifier) + "%'", null, null);
         boolean b = (favoriteCursor.getCount() == 1)
-                && GeneralPreferences.hasActivateSync(mAppContext, SessionUtils.getAccount(mAppContext));
+                && GeneralPreferences.hasActivateSync(mAppContext, account);
         favoriteCursor.close();
         return b;
     }
@@ -631,8 +631,8 @@ public File getSyncFile(Account account, Node node)
     {
         if (node.isFolder()) { return null; }
         if (node instanceof NodeSyncPlaceHolder) { return StorageManager.getSynchroFile(mAppContext,
-                SessionUtils.getAccount(mAppContext), node.getName(), node.getIdentifier()); }
-        return StorageManager.getSynchroFile(mAppContext, SessionUtils.getAccount(mAppContext), (Document) node);
+                account, node.getName(), node.getIdentifier()); }
+        return StorageManager.getSynchroFile(mAppContext, account, (Document) node);
     }
 
     public Uri getUri(Account account, String nodeIdentifier)