platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java in rhodes-1.4.2 vs platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java in rhodes-1.5.0

- old
+ new

@@ -42,10 +42,11 @@ SyncNotification m_initialSyncNotify; Mutex m_mxSyncNotifications = new Mutex(); ISyncStatusListener m_syncStatusListener = null; + boolean m_bEnableReporting = false; SyncEngine getSync(){ return m_syncEngine; } DBAdapter getDB(){ return getSync().getDB(); } NetRequest getNet(){ return getSync().getNet(); } @@ -319,25 +320,36 @@ synchronized(m_mxSyncNotifications){ m_syncStatusListener = listener; } } + void enableReporting(boolean bEnable) + { + m_bEnableReporting = bEnable; + } + private void reportSyncStatus(String status, int error, String strDetails) { synchronized(m_mxSyncNotifications) { - if (m_syncStatusListener != null) { - if ( strDetails.length() == 0 ) - strDetails = RhoRuby.getErrorText(error); - status += (strDetails.length() > 0 ? RhoRuby.getMessageText("details") + strDetails: ""); + if (m_syncStatusListener != null && (m_bEnableReporting || error == RhoRuby.ERR_SYNCVERSION) ) { + if ( error == RhoRuby.ERR_SYNCVERSION ) + status = RhoRuby.getErrorText(error); + else + { + if ( strDetails.length() == 0 ) + strDetails = RhoRuby.getErrorText(error); + status += (strDetails.length() > 0 ? RhoRuby.getMessageText("details") + strDetails: ""); + } + LOG.INFO("Status: "+status); m_syncStatusListener.reportStatus( status, error); } } } - + void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strMessage, Vector/*Ptr<CSyncSource*>&*/ sources ) { for( int i = 0; i < sources.size(); i++ ) { doFireSyncNotification( (SyncSource)sources.elementAt(i), bFinish, nErrCode, strMessage );