service move package

Change-Id: I33b09a8488ca922ca7622cc3bba688c5f24cc28a

ring-android/app/src/main/AndroidManifest.xml

@@ -206,12 +206,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:exported="false"
             android:foregroundServiceType="dataSync" />
         <service
-            android:name=".services.SyncService"
+            android:name=".service.SyncService"
             android:description="@string/data_transfer_service_description"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
         <service
-            android:name=".services.LocationSharingService"
+            android:name=".service.LocationSharingService"
             android:exported="false"
             android:foregroundServiceType="location" />
 

ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java

@@ -67,10 +67,10 @@ import cx.ring.services.ContactServiceImpl;
 import cx.ring.services.DataTransferService;
 import cx.ring.services.DeviceRuntimeServiceImpl;
 import cx.ring.services.HistoryServiceImpl;
-import cx.ring.services.LocationSharingService;
+import cx.ring.service.LocationSharingService;
 import cx.ring.services.NotificationServiceImpl;
 import cx.ring.services.SharedPreferencesServiceImpl;
-import cx.ring.services.SyncService;
+import cx.ring.service.SyncService;
 import cx.ring.settings.AccountFragment;
 import cx.ring.settings.SettingsFragment;
 import cx.ring.share.ShareFragment;

ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.java

@@ -79,7 +79,7 @@ import cx.ring.R;
 import cx.ring.application.JamiApplication;
 import cx.ring.views.AvatarFactory;
 import cx.ring.databinding.FragLocationSharingBinding;
-import cx.ring.services.LocationSharingService;
+import cx.ring.service.LocationSharingService;
 import cx.ring.utils.ConversationPath;
 import cx.ring.utils.TouchClickListener;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;

ring-android/app/src/main/java/cx/ring/service/BootReceiver.java

@@ -29,7 +29,6 @@ import javax.inject.Inject;
 
 import cx.ring.application.JamiApplication;
 import net.jami.services.PreferencesService;
-import cx.ring.services.SyncService;
 
 public class BootReceiver extends BroadcastReceiver {
     private static final String TAG = BootReceiver.class.getSimpleName();

ring-android/app/src/main/java/cx/ring/service/JamiJobService.java

@@ -30,7 +30,6 @@ import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 
 import cx.ring.application.JamiApplication;
-import cx.ring.services.SyncService;
 
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 public class JamiJobService extends JobService

ring-android/app/src/main/java/cx/ring/services/LocationSharingService.java → ring-android/app/src/main/java/cx/ring/service/LocationSharingService.java

@@ -17,7 +17,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package cx.ring.services;
+package cx.ring.service;
 
 import android.Manifest;
 import android.app.Notification;
@@ -70,11 +70,10 @@ import cx.ring.fragments.ConversationFragment;
 import net.jami.services.AccountService;
 import net.jami.services.CallService;
 
+import cx.ring.services.NotificationServiceImpl;
 import cx.ring.utils.ConversationPath;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.ObservableSource;
-import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;

ring-android/app/src/main/java/cx/ring/services/SyncService.java → ring-android/app/src/main/java/cx/ring/service/SyncService.java

@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-package cx.ring.services;
+package cx.ring.service;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -41,6 +41,7 @@ import javax.inject.Inject;
 import cx.ring.R;
 import cx.ring.application.JamiApplication;
 import cx.ring.client.HomeActivity;
+import cx.ring.services.NotificationServiceImpl;
 
 public class SyncService extends Service {
     public static final int NOTIF_SYNC_SERVICE_ID = 1004;

ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.java

@@ -46,7 +46,7 @@ import static cx.ring.fragments.ConversationFragment.KEY_PREFERENCE_CONVERSATION
 /**
  * Implements the necessary Android related methods for the {@link HistoryService}
  */
-public class HistoryServiceImpl extends net.jami.services.HistoryService {
+public class HistoryServiceImpl extends HistoryService {
     private static final String TAG = HistoryServiceImpl.class.getSimpleName();
     private final static String DATABASE_NAME = "history.db";
     private final static String LEGACY_DATABASE_KEY = "legacy";