Rename QFieldService to QFieldCloudService

platform/android/AndroidManifest.xml.in

@@ -275,7 +275,7 @@
     <meta-data android:name="io.sentry.environment" android:value="@SENTRY_ENV@" />
     <meta-data android:name="io.sentry.auto-init" android:value="false" />
 
-    <service android:process=":qt" android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldService">
+    <service android:process=":qt" android:name="ch.opengis.@APP_PACKAGE_NAME@.QFieldCloudService">
       <meta-data android:name="android.app.arguments" android:value="--service"/>
       <meta-data android:name="android.app.lib_name" android:value="@string/lib_name"/>
       <meta-data android:name="android.app.repository" android:value="default"/>

platform/android/src/ch/opengis/qfield/QFieldService.java → platform/android/src/ch/opengis/qfield/QFieldCloudService.java

@@ -1,5 +1,5 @@
 /**
- * QFieldService.java
+ * QFieldCloudService.java
  * @author  Mathieu Pellerin - <mathieu@opengis.ch>
  * @version 0.5
  */
@@ -41,23 +41,23 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import android.util.Log;
 import org.qtproject.qt.android.bindings.QtService;
 
-public class QFieldService extends QtService {
+public class QFieldCloudService extends QtService {
 
     private NotificationManager notificationManager;
     private NotificationChannel notificationChannel;
 
     private final String CHANNEL_ID = "qfield_service_01";
     private final int NOTIFICATION_ID = 101;
 
-    public static void startQFieldService(Context context) {
-        Log.v("QField Service", "Starting QFieldService");
-        Intent intent = new Intent(context, QFieldService.class);
+    public static void startQFieldCloudService(Context context) {
+        Log.v("QFieldCloudService", "Starting QFieldCloudService");
+        Intent intent = new Intent(context, QFieldCloudService.class);
         context.startService(intent);
     }
 
     @Override
     public void onCreate() {
-        Log.v("QField Service", "onCreate triggered");
+        Log.v("QFieldCloudService", "onCreate triggered");
         super.onCreate();
 
         notificationManager =
@@ -77,7 +77,7 @@ public void onCreate() {
 
     @Override
     public void onDestroy() {
-        Log.v("QField Service", "onDestroy triggered");
+        Log.v("QFieldCloudService", "onDestroy triggered");
         notificationManager.cancel(NOTIFICATION_ID);
         super.onDestroy();
     }

src/app/main.cpp

@@ -24,7 +24,7 @@
 #endif
 
 #if defined( Q_OS_ANDROID )
-#include "qfieldservice.h"
+#include "qfieldcloudservice.h"
 #endif
 
 #include <qgsapplication.h>
@@ -82,7 +82,7 @@ int main( int argc, char **argv )
 
 #if defined( Q_OS_ANDROID )
     // For now the service only deals with background attachment uploads and will terminate once all uploads are done
-    QFieldService app( argc, argv );
+    QFieldCloudService app( argc, argv );
 #endif
     return 0;
   }

src/core/platforms/android/androidplatformutilities.cpp

@@ -697,9 +697,9 @@ void AndroidPlatformUtilities::uploadPendingAttachments( QFieldCloudConnection *
   QTimer::singleShot( 500, [connection]() {
     if ( connection )
     {
-      qInfo() << "Launching service from main...";
-      QJniObject::callStaticMethod<void>( "ch/opengis/" APP_PACKAGE_NAME "/QFieldService",
-                                          "startQFieldService",
+      qInfo() << "Launching QFieldCloud service from main...";
+      QJniObject::callStaticMethod<void>( "ch/opengis/" APP_PACKAGE_NAME "/QFieldCloudService",
+                                          "startQFieldCloudService",
                                           "(Landroid/content/Context;)V",
                                           qtAndroidContext().object() );
     }

src/service/CMakeLists.txt

@@ -1,5 +1,5 @@
-set(QFIELD_SERVICE_SRCS qfieldservice.cpp)
-set(QFIELD_SERVICE_HDRS qfieldservice.h)
+set(QFIELD_SERVICE_SRCS qfieldcloudservice.cpp)
+set(QFIELD_SERVICE_HDRS qfieldcloudservice.h)
 
 add_library(qfield_service STATIC ${QFIELD_SERVICE_SRCS} ${QFIELD_SERVICE_HDRS})
 
@@ -13,6 +13,7 @@ target_include_directories(qfield_service
                            PUBLIC ${CMAKE_SOURCE_DIR}/src/service)
 
 target_compile_features(qfield_service PUBLIC cxx_std_17)
+
 set_target_properties(qfield_service PROPERTIES AUTOMOC TRUE)
 
 target_link_libraries(qfield_service PRIVATE qfield_core ${QGIS_CORE_LIBRARY})

src/service/qfieldservice.cpp → src/service/qfieldcloudservice.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-  qfieldservice.cpp - QFieldService
+  qfieldcloudservice.cpp - QFieldCloudService
 
  ---------------------
  begin                : 04.12.2022
@@ -16,11 +16,11 @@
 
 #include "qfield_android.h"
 #include "qfieldcloudconnection.h"
-#include "qfieldservice.h"
+#include "qfieldcloudservice.h"
 
 #include <QSettings>
 
-QFieldService::QFieldService( int &argc, char **argv )
+QFieldCloudService::QFieldCloudService( int &argc, char **argv )
   : QAndroidService( argc, argv )
 {
   QSettings settings;
@@ -39,6 +39,6 @@ QFieldService::QFieldService( int &argc, char **argv )
   exit( 0 );
 }
 
-QFieldService::~QFieldService()
+QFieldCloudService::~QFieldCloudService()
 {
 }

src/service/qfieldservice.h → src/service/qfieldcloudservice.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-  qfieldservice.h - QFieldService
+  qFieldcloudservice.h - QFieldCloudService
 
  ---------------------
  begin                : 04.12.2022
@@ -19,12 +19,11 @@
 #include <QtCore/private/qandroidextras_p.h>
 #include <QtGlobal>
 
-class QFIELD_SERVICE_EXPORT QFieldService : public QAndroidService
+class QFIELD_SERVICE_EXPORT QFieldCloudService : public QAndroidService
 {
     Q_OBJECT
 
   public:
-    QFieldService( int &argc, char **argv );
-
-    ~QFieldService() override;
+    QFieldCloudService( int &argc, char **argv );
+    ~QFieldCloudService() override;
 };