mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-08 00:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile-widgets: activate uploadDiveShare in qmlmanager

Browse source 
Remove "TO BE IMPLEMENTED" and add call doUpload

Connect signal to signal in QMLManager to avoid registring the
upload class.

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-08 11:52:38 +01:00 • committed by Dirk Hohndel
parent dd183eaabf
commit 53069fe777
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mobile-widgets/qmlmanager.cpp
View file

@ -48,6 +48,7 @@
#include "core/exportfuncs.h" #include "core/exportfuncs.h"
#include "core/worldmap-save.h" #include "core/worldmap-save.h"
#include "core/uploadDiveLogsDE.h" #include "core/uploadDiveLogsDE.h"
#include "core/uploadDiveShare.h"
QMLManager *QMLManager::m_instance = NULL; QMLManager *QMLManager::m_instance = NULL;
@ -166,6 +167,14 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
this, &QMLManager::uploadFinish); this, &QMLManager::uploadFinish);
connect(uploadDiveLogsDE::instance(), &uploadDiveLogsDE::uploadProgress, connect(uploadDiveLogsDE::instance(), &uploadDiveLogsDE::uploadProgress,
this, &QMLManager::uploadProgress); this, &QMLManager::uploadProgress);
connect(uploadDiveShare::instance(), &uploadDiveShare::uploadProgress,
this, &QMLManager::uploadProgress);
// uploadDiveShare::uploadFinish() is defined with 3 parameters,
// whereas QMLManager::uploadFinish() is defined with 2 paramters,
// Solution add a slot as landing zone.
connect(uploadDiveShare::instance(), SIGNAL(uploadDiveShare::uploadFinish(bool, const QString &, const QByteArray &)),
this, SLOT(uploadFinishSlot(bool, const QString &, const QByteArray &)));
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
@ -2201,13 +2210,16 @@ void QMLManager::exportToWEB(export_types type, QString userId, QString password
uploadDiveLogsDE::instance()->doUpload(false, userId, password); uploadDiveLogsDE::instance()->doUpload(false, userId, password);
break; break;
case EX_DIVESHARE: case EX_DIVESHARE:
// TO BE IMPLEMENTED uploadDiveShare::instance()->doUpload(false, userId, anonymize);
// Current call in Desktop-widgets
// DiveShareExportDialog::instance()->
// prepareDivesForUpload(ui->exportSelected->isChecked());
break; break;
default: default:
qDebug() << "upload to unknown type " << type << " using " << userId << "/" << password << " remove names " << anonymize; qDebug() << "upload to unknown type " << type << " using " << userId << "/" << password << " remove names " << anonymize;
break; break;
} }
} }
void QMLManager::uploadFinishSlot(bool success, const QString &text, const QByteArray &html)
{
emit uploadFinish(success, text);
}

3
mobile-widgets/qmlmanager.h
View file

@ -298,6 +298,9 @@ signals:
// From upload process // From upload process
void uploadFinish(bool success, const QString &text); void uploadFinish(bool success, const QString &text);
void uploadProgress(qreal percentage); void uploadProgress(qreal percentage);
private slots:
void uploadFinishSlot(bool success, const QString &text, const QByteArray &html);
}; };
#endif #endif