fixes

Author: Skycoder42

src/datasyncandroid/androidbackgroundservice.cpp

@@ -96,12 +96,12 @@ int AndroidBackgroundService::onStartCommand(const QAndroidIntent &intent, int f
 	if(intent.handle().isValid()) {
 		const auto action = intent.handle().callObjectMethod("getAction", "()Ljava/lang/String;").toString();
 		if(action == RegisterSyncAction) {
-			const auto delay = intent.handle().callMethod<jlong>("getLongExtra", "(Ljava/lang/String;J)J",
-																 QAndroidJniObject::fromString(QStringLiteral("de.skycoder42.qtdatasync.SyncBootReceiver.key.delay")).object(),
+			const auto interval = intent.handle().callMethod<jlong>("getLongExtra", "(Ljava/lang/String;J)J",
+																 QAndroidJniObject::fromString(QStringLiteral("de.skycoder42.qtdatasync.SyncBootReceiver.key.interval")).object(),
 																 static_cast<jlong>(60));
 			QMetaObject::invokeMethod(this, "registerSync", Qt::QueuedConnection,
 									  Q_ARG(int, startId),
-									  Q_ARG(qint64, delay));
+									  Q_ARG(qint64, interval));
 		} else if(action == BackgroundSyncAction) {
 			QMetaObject::invokeMethod(this, "startBackgroundSync", Qt::QueuedConnection,
 									  Q_ARG(int, startId));
@@ -158,14 +158,14 @@ void AndroidBackgroundService::startBackgroundSync(int startId)
 	}
 }
 
-void AndroidBackgroundService::registerSync(int startId, qint64 delay)
+void AndroidBackgroundService::registerSync(int startId, qint64 interval)
 {
 	AndroidSyncControl syncControl;
 	syncControl.setServiceId(QtAndroid::androidService()
 							 .callObjectMethod("getClass", "()Ljava/lang/Class;")
 							 .callObjectMethod("getName", "()Ljava/lang/String;")
 							 .toString());
-	syncControl.setDelay(delay);
+	syncControl.setInterval(interval);
 	syncControl.setEnabled(true);
 	if(!syncControl.isEnabled()) {
 		qWarning() << "Failed to register service" << syncControl.serviceId()

src/datasyncandroid/androidbackgroundservice.h

@@ -53,7 +53,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
 	void startBackgroundSync(int startId);
-	void registerSync(int startId, qint64 delay);
+	void registerSync(int startId, qint64 interval);
 	void backendReady();
 
 private:

src/imports/datasync/qtdatasync_plugin.cpp

@@ -7,6 +7,7 @@
 #endif
 #ifdef Q_OS_IOS
 #include <QtDataSyncIos/IosSyncDelegate>
+#include "qqmliossyncsingleton.h"
 #endif
 
 #include "qqmldatastore.h"

src/java/src/de/skycoder42/qtdatasync/SyncBootReceiver.java

@@ -15,7 +15,7 @@
 
 public class SyncBootReceiver extends BroadcastReceiver {
 	public static final String ServiceNameKey = "de.skycoder42.qtdatasync.SyncBootReceiver.key.serviceName";
-	public static final String DelayKey = "de.skycoder42.qtdatasync.SyncBootReceiver.key.delay";
+	public static final String IntervalKey = "de.skycoder42.qtdatasync.SyncBootReceiver.key.interval";
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
@@ -25,25 +25,25 @@ public void onReceive(Context context, Intent intent) {
 
 		Intent startIntent = new Intent("de.skycoder42.qtdatasync.registersync")
 			.setClassName(context, prefs.getString(ServiceNameKey, AndroidService.class.getName()))
-			.putExtra(DelayKey, prefs.getLong(DelayKey, 60));
+			.putExtra(IntervalKey, prefs.getLong(IntervalKey, 60));
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
 			context.startForegroundService(startIntent);
 		else
 			context.startService(startIntent);
 	}
 
-	public static void prepareRegistration(Context context, String serviceName, long delay) {
+	public static void prepareRegistration(Context context, String serviceName, long interval) {
 		PreferenceManager.getDefaultSharedPreferences(context).edit()
 			.putString(ServiceNameKey, serviceName)
-			.putLong(DelayKey, delay)
+			.putLong(IntervalKey, interval)
 			.apply();
 		setComponentState(context, true);
 	}
 
 	public static void clearRegistration(Context context) {
 		PreferenceManager.getDefaultSharedPreferences(context).edit()
 			.remove(ServiceNameKey)
-			.remove(DelayKey)
+			.remove(IntervalKey)
 			.apply();
 		setComponentState(context, false);
 	}