mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	The copy/pasting of dive-sites was fundamentally broken in at least two ways: 1) The dive-site pointer in struct dive was simply overwritten, which breaks internal consistency. Also, no dive-site changed signals where sent. 2) The copied dive-site was stored as a pointer in a struct dive. Thus, the user could copy a dive, then delete the dive-site and paste. This would lead to a dangling pointer and ultimately crash the application. Fix this by storing the UUID of the dive-site, not a pointer. To do that, don't store a copy of the dive, but collect all the data in a `dive_paste_data` structure. If the dive site has been deleted on paste, do nothing. Send the appropriate signals on pasting. The mobile version had an additional bug: It kept a pointer to the dive to be copied, which might become stale by undo. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
		
			
				
	
	
		
			325 lines
		
	
	
	
		
			12 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			325 lines
		
	
	
	
		
			12 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| #ifndef QMLMANAGER_H
 | |
| #define QMLMANAGER_H
 | |
| 
 | |
| #include <QObject>
 | |
| #include <QString>
 | |
| #include <QNetworkAccessManager>
 | |
| #include <QScreen>
 | |
| #include <QElapsedTimer>
 | |
| #include <QColor>
 | |
| #include <QFile>
 | |
| #include <QTimer>
 | |
| 
 | |
| #include "core/btdiscovery.h"
 | |
| #include "core/downloadfromdcthread.h"
 | |
| #include "qt-models/completionmodels.h"
 | |
| #include "qt-models/divelocationmodel.h"
 | |
| #include "core/settings/qPrefCloudStorage.h"
 | |
| #include "core/subsurface-qt/divelistnotifier.h"
 | |
| 
 | |
| #if defined(Q_OS_ANDROID)
 | |
| #include "core/serial_usb_android.h"
 | |
| #elif defined(Q_OS_IOS)
 | |
| #include "ios/ios-share.h"
 | |
| #endif
 | |
| 
 | |
| class QAction;
 | |
| struct DiveSiteChange; // An obscure implementation artifact - remove in due course.
 | |
| 
 | |
| class QMLManager : public QObject {
 | |
| 	Q_OBJECT
 | |
| 	Q_PROPERTY(bool loadFromCloud MEMBER m_loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged)
 | |
| 	Q_PROPERTY(QString startPageText MEMBER m_startPageText WRITE setStartPageText NOTIFY startPageTextChanged)
 | |
| 	Q_PROPERTY(bool verboseEnabled MEMBER m_verboseEnabled WRITE setVerboseEnabled NOTIFY verboseEnabledChanged)
 | |
| 	Q_PROPERTY(QString notificationText MEMBER m_notificationText WRITE setNotificationText NOTIFY notificationTextChanged)
 | |
| 	Q_PROPERTY(QStringList suitList READ suitList NOTIFY suitListChanged)
 | |
| 	Q_PROPERTY(QStringList buddyList READ buddyList NOTIFY buddyListChanged)
 | |
| 	Q_PROPERTY(QStringList diveguideList READ diveguideList NOTIFY diveguideListChanged)
 | |
| 	Q_PROPERTY(QStringList locationList READ locationList NOTIFY locationListChanged)
 | |
| 	Q_PROPERTY(QStringList cylinderListInit READ cylinderListInit CONSTANT)
 | |
| 	Q_PROPERTY(QStringList defaultCylinderListInit READ defaultCylinderListInit CONSTANT)
 | |
| 	Q_PROPERTY(QStringList cloudCacheList READ cloudCacheList NOTIFY cloudCacheListChanged)
 | |
| 	Q_PROPERTY(QString progressMessage MEMBER m_progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
 | |
| 	Q_PROPERTY(bool btEnabled MEMBER m_btEnabled WRITE setBtEnabled NOTIFY btEnabledChanged)
 | |
| 
 | |
| 	Q_PROPERTY(bool pasteDiveSite MEMBER m_pasteDiveSite)
 | |
| 	Q_PROPERTY(bool pasteNotes MEMBER m_pasteNotes)
 | |
| 	Q_PROPERTY(bool pasteDiveGuide MEMBER m_pasteDiveGuide)
 | |
| 	Q_PROPERTY(bool pasteBuddy MEMBER m_pasteBuddy)
 | |
| 	Q_PROPERTY(bool pasteSuit MEMBER m_pasteSuit)
 | |
| 	Q_PROPERTY(bool pasteRating MEMBER m_pasteRating)
 | |
| 	Q_PROPERTY(bool pasteVisibility MEMBER m_pasteVisibility)
 | |
| 	Q_PROPERTY(bool pasteTags MEMBER m_pasteTags)
 | |
| 	Q_PROPERTY(bool pasteCylinders MEMBER m_pasteCylinders)
 | |
| 	Q_PROPERTY(bool pasteWeights MEMBER m_pasteWeights)
 | |
| 
 | |
| 	Q_PROPERTY(QString DC_vendor READ DC_vendor WRITE DC_setVendor)
 | |
| 	Q_PROPERTY(QString DC_product READ DC_product WRITE DC_setProduct)
 | |
| 	Q_PROPERTY(QString DC_devName READ DC_devName WRITE DC_setDevName)
 | |
| 	Q_PROPERTY(QString DC_devBluetoothName READ DC_devBluetoothName WRITE DC_setDevBluetoothName)
 | |
| 	Q_PROPERTY(QString descriptor READ DC_descriptor)
 | |
| 	Q_PROPERTY(bool DC_forceDownload READ DC_forceDownload WRITE DC_setForceDownload NOTIFY DC_ForceDownloadChanged)
 | |
| 	Q_PROPERTY(bool DC_bluetoothMode READ DC_bluetoothMode WRITE DC_setBluetoothMode)
 | |
| 	Q_PROPERTY(bool DC_saveDump READ DC_saveDump WRITE DC_setSaveDump)
 | |
| 	Q_PROPERTY(QString pluggedInDeviceName MEMBER m_pluggedInDeviceName NOTIFY pluggedInDeviceNameChanged)
 | |
| 	Q_PROPERTY(bool showNonDiveComputers MEMBER m_showNonDiveComputers WRITE setShowNonDiveComputers NOTIFY showNonDiveComputersChanged)
 | |
| 	Q_PROPERTY(qPrefCloudStorage::cloud_status oldStatus MEMBER m_oldStatus WRITE setOldStatus NOTIFY oldStatusChanged)
 | |
| 	Q_PROPERTY(QString undoText READ getUndoText NOTIFY undoTextChanged) // this is a read-only property
 | |
| 	Q_PROPERTY(QString redoText READ getRedoText NOTIFY redoTextChanged) // this is a read-only property
 | |
| 	Q_PROPERTY(bool diveListProcessing MEMBER m_diveListProcessing  WRITE setDiveListProcessing NOTIFY diveListProcessingChanged)
 | |
| 	Q_PROPERTY(bool initialized MEMBER m_initialized NOTIFY initializedChanged)
 | |
| 	Q_PROPERTY(QString syncState READ getSyncState NOTIFY syncStateChanged)
 | |
| 	Q_PROPERTY(QString passwordState READ getPasswordState NOTIFY passwordStateChanged)
 | |
| public:
 | |
| 	QMLManager();
 | |
| 	~QMLManager();
 | |
| 
 | |
| 	enum export_types {
 | |
| 		EX_DIVES_XML,
 | |
| 		EX_DIVE_SITES_XML,
 | |
| 		EX_DIVELOGS_DE,
 | |
| 		EX_DIVESHARE
 | |
| 	};
 | |
| 	Q_ENUM(export_types)
 | |
| #if !defined(Q_OS_ANDROID)
 | |
| 	Q_INVOKABLE void exportToFile(export_types type, QString directory, bool anonymize);
 | |
| #endif
 | |
| 	Q_INVOKABLE void exportToWEB(export_types type, QString userId, QString password, bool anonymize);
 | |
| 	Q_INVOKABLE void shareViaEmail(export_types type, bool anonymize);
 | |
| 
 | |
| 	QString DC_vendor() const;
 | |
| 	void DC_setVendor(const QString& vendor);
 | |
| 
 | |
| 	QString DC_product() const;
 | |
| 	void DC_setProduct(const QString& product);
 | |
| 
 | |
| 	QString DC_devName() const;
 | |
| 	void DC_setDevName(const QString& devName);
 | |
| 
 | |
| 	Q_INVOKABLE void retrieveBluetoothName();
 | |
| 
 | |
| 	QString DC_devBluetoothName() const;
 | |
| 	void DC_setDevBluetoothName(const QString& devBluetoothName);
 | |
| 
 | |
| 	QString DC_descriptor() const;
 | |
| 
 | |
| 	bool DC_forceDownload() const;
 | |
| 	void DC_setForceDownload(bool force);
 | |
| 
 | |
| 	bool DC_bluetoothMode() const;
 | |
| 	void DC_setBluetoothMode(bool mode);
 | |
| 
 | |
| 	bool DC_saveDump() const;
 | |
| 	void DC_setSaveDump(bool dumpMode);
 | |
| 
 | |
| 	QString getUndoText() const;
 | |
| 	QString getRedoText() const;
 | |
| 
 | |
| 	Q_INVOKABLE QStringList getProductListFromVendor(const QString& vendor);
 | |
| 	Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product);
 | |
| 	Q_INVOKABLE int getDetectedVendorIndex();
 | |
| 	Q_INVOKABLE int getDetectedProductIndex(const QString ¤tVendorText);
 | |
| 	Q_INVOKABLE int getConnectionIndex(const QString &deviceSubstr);
 | |
| 	Q_INVOKABLE void setGitLocalOnly(const bool &value);
 | |
| 	Q_INVOKABLE void setFilter(const QString filterText, int mode);
 | |
| 	Q_INVOKABLE void selectRow(int row);
 | |
| 	Q_INVOKABLE void selectSwipeRow(int row);
 | |
| 	Q_INVOKABLE void importCacheRepo(QString repo);
 | |
| 
 | |
| 	static QMLManager *instance();
 | |
| 	Q_INVOKABLE void registerError(QString error);
 | |
| 	QString consumeError();
 | |
| 
 | |
| 	bool verboseEnabled() const;
 | |
| 	void setVerboseEnabled(bool verboseMode);
 | |
| 
 | |
| 	void setLoadFromCloud(bool done);
 | |
| 	void syncLoadFromCloud();
 | |
| 
 | |
| 	QString startPageText() const;
 | |
| 	void setStartPageText(const QString& text);
 | |
| 
 | |
| 	QString notificationText() const;
 | |
| 	void setNotificationText(QString text);
 | |
| 
 | |
| 	QString progressMessage() const;
 | |
| 	void setProgressMessage(QString text);
 | |
| 
 | |
| 	bool btEnabled() const;
 | |
| 	void setBtEnabled(bool value);
 | |
| 
 | |
| 	void setShowNonDiveComputers(bool show);
 | |
| 	qreal lastDevicePixelRatio();
 | |
| 	void setDevicePixelRatio(qreal dpr, QScreen *screen);
 | |
| 
 | |
| 	void setDiveListProcessing(bool value);
 | |
| 
 | |
| 	QStringList suitList() const;
 | |
| 	QStringList buddyList() const;
 | |
| 	QStringList diveguideList() const;
 | |
| 	QStringList locationList() const;
 | |
| 	QStringList cylinderListInit() const;
 | |
| 	QStringList defaultCylinderListInit() const;
 | |
| 	QStringList cloudCacheList() const;
 | |
| 	Q_INVOKABLE void setStatusbarColor(QColor color);
 | |
| 	void btHostModeChange(QBluetoothLocalDevice::HostMode state);
 | |
| 	QObject *qmlWindow;
 | |
| 
 | |
| #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 | |
| 	void writeToAppLogFile(QString logText);
 | |
| #endif
 | |
| 	qPrefCloudStorage::cloud_status oldStatus() const;
 | |
| 	void setOldStatus(const qPrefCloudStorage::cloud_status value);
 | |
| 	void rememberOldStatus();
 | |
| 
 | |
| 	QString getSyncState() const;
 | |
| 	QString getPasswordState() const;
 | |
| 
 | |
| public slots:
 | |
| 	void appInitialized();
 | |
| 	void applicationStateChanged(Qt::ApplicationState state);
 | |
| 	void saveCloudCredentials(const QString &email, const QString &password, const QString &pin);
 | |
| 	void commitChanges(QString diveId, QString number, QString date, QString location, QString gps,
 | |
| 			   QString duration, QString depth, QString airtemp,
 | |
| 			   QString watertemp, QString suit, QString buddy,
 | |
| 			   QString diveGuide, QString tags, QString weight, QString notes, QStringList startpressure,
 | |
| 			   QStringList endpressure, QStringList gasmix, QStringList usedCylinder, int rating, int visibility, QString state);
 | |
| 	void updateTripDetails(QString tripIdString, QString tripLocation, QString tripNotes);
 | |
| 	void removeDiveFromTrip(int id);
 | |
| 	void addTripForDive(int id);
 | |
| 	void addDiveToTrip(int id, int tripId);
 | |
| 	void changesNeedSaving(bool fromUndo = false);
 | |
| 	void openNoCloudRepo();
 | |
| 	void saveChangesCloud(bool forceRemoteSync);
 | |
| 	void selectDive(int id);
 | |
| 	void deleteDive(int id);
 | |
| 	void deleteAccount();
 | |
| 	void toggleDiveInvalid(int id);
 | |
| 	void copyDiveData(int id);
 | |
| 	void pasteDiveData(int id);
 | |
| 	void undo();
 | |
| 	void redo();
 | |
| 	int addDive();
 | |
| 	void cancelDownloadDC();
 | |
| 	QString getCombinedLogs();
 | |
| 	void copyAppLogToClipboard();
 | |
| 	bool createSupportEmail();
 | |
| 	void finishSetup();
 | |
| 	QString getNumber(const QString& diveId);
 | |
| 	QString getDate(const QString& diveId);
 | |
| 	QString getGpsFromSiteName(const QString& siteName);
 | |
| 	QString getVersion() const;
 | |
| 	void refreshDiveList();
 | |
| 	void screenChanged(QScreen *screen);
 | |
| 	void appendTextToLog(const QString &newText);
 | |
| 	void quit();
 | |
| 	void btRescan();
 | |
| 	void usbRescan();
 | |
| 	void rescanConnections();
 | |
| #if defined(Q_OS_ANDROID)
 | |
| 	void showDownloadPage(QAndroidJniObject usbDevice);
 | |
| 	void restartDownload(QAndroidJniObject usbDevice);
 | |
| 	void androidUsbPopoulateConnections();
 | |
| 	QString getProductVendorConnectionIdx(android_usb_serial_device_descriptor descriptor);
 | |
| #endif
 | |
| 	void divesChanged(const QVector<dive *> &dives, DiveField field);
 | |
| 
 | |
| private:
 | |
| 	BuddyCompletionModel buddyModel;
 | |
| 	SuitCompletionModel suitModel;
 | |
| 	DiveGuideCompletionModel diveguideModel;
 | |
| 	DiveSiteSortedModel locationModel;
 | |
| 	QString m_startPageText;
 | |
| 	QString m_lastError;
 | |
| 	bool m_verboseEnabled;
 | |
| 	bool m_diveListProcessing;
 | |
| 	bool m_initialized;
 | |
| 	bool m_loadFromCloud;
 | |
| 	static QMLManager *m_instance;
 | |
| 	QString m_notificationText;
 | |
| 	qreal m_lastDevicePixelRatio;
 | |
| 	QElapsedTimer timer;
 | |
| 	bool checkDate(struct dive *d, QString date);
 | |
| 	bool checkLocation(DiveSiteChange &change, struct dive *d, QString location, QString gps);
 | |
| 	bool checkDuration(struct dive *d, QString duration);
 | |
| 	bool checkDepth(struct dive *d, QString depth);
 | |
| 	bool currentGitLocalOnly;
 | |
| 	bool localChanges;
 | |
| 	QString m_progressMessage;
 | |
| 	bool m_btEnabled;
 | |
| 	void updateAllGlobalLists();
 | |
| 	void updateHaveLocalChanges(bool status);
 | |
| 
 | |
| 	bool m_pasteDiveSite;
 | |
| 	bool m_pasteNotes;
 | |
| 	bool m_pasteDiveGuide;
 | |
| 	bool m_pasteBuddy;
 | |
| 	bool m_pasteSuit;
 | |
| 	bool m_pasteRating;
 | |
| 	bool m_pasteVisibility;
 | |
| 	bool m_pasteTags;
 | |
| 	bool m_pasteCylinders;
 | |
| 	bool m_pasteWeights;
 | |
| 
 | |
| 	location_t getGps(QString &gps);
 | |
| 	QString m_pluggedInDeviceName;
 | |
| 	bool m_showNonDiveComputers;
 | |
| 	struct dive_paste_data paste_data;
 | |
| 	QAction *undoAction;
 | |
| 
 | |
| 	bool verifyCredentials(QString email, QString password, QString pin);
 | |
| 	void loadDivesWithValidCredentials();
 | |
| 	void revertToNoCloudIfNeeded();
 | |
| 	void consumeFinishedLoad();
 | |
| 	void mergeLocalRepo();
 | |
| 	void openLocalThenRemote(QString url);
 | |
| 	void saveChangesLocal();
 | |
| 
 | |
| #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 | |
| 	QString appLogFileName;
 | |
| 	QFile appLogFile;
 | |
| 	bool appLogFileOpen;
 | |
| #endif
 | |
| #if defined(Q_OS_IOS)
 | |
| 	IosShare iosshare;
 | |
| #endif
 | |
| 	qPrefCloudStorage::cloud_status m_oldStatus;
 | |
| 
 | |
| signals:
 | |
| 	void verboseEnabledChanged();
 | |
| 	void diveListProcessingChanged();
 | |
| 	void initializedChanged();
 | |
| 	void loadFromCloudChanged();
 | |
| 	void startPageTextChanged();
 | |
| 	void notificationTextChanged();
 | |
| 	void sendScreenChanged(QScreen *screen);
 | |
| 	void progressMessageChanged();
 | |
| 	void btEnabledChanged();
 | |
| 	void suitListChanged();
 | |
| 	void buddyListChanged();
 | |
| 	void diveguideListChanged();
 | |
| 	void locationListChanged();
 | |
| 	void cloudCacheListChanged();
 | |
| 	void waitingForPositionChanged();
 | |
| 	void pluggedInDeviceNameChanged();
 | |
| 	void showNonDiveComputersChanged();
 | |
| 	void DC_ForceDownloadChanged();
 | |
| 	void oldStatusChanged();
 | |
| 	void undoTextChanged();
 | |
| 	void redoTextChanged();
 | |
| 	void restartDownloadSignal();
 | |
| 	void syncStateChanged();
 | |
| 	void passwordStateChanged();
 | |
| 	void changesNeedSavingSignal();
 | |
| 
 | |
| 	// From upload process
 | |
| 	void uploadFinish(bool success, const QString &text);
 | |
| 	void uploadProgress(qreal percentage);
 | |
| 
 | |
| private slots:
 | |
| 	void uploadFinishSlot(bool success, const QString &text, const QByteArray &html);
 | |
| 	void saveUnsaved();
 | |
| };
 | |
| 
 | |
| #endif
 |