diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml index aa73e5a8c930143215eef27d79cad20f4fcfea4e..03cccb908fc936a88ccae0191615fe57145cf5ba 100644 --- a/ring-android/app/src/main/AndroidManifest.xml +++ b/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" /> diff --git a/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java b/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java index c600b3296fb2db6fcc89770c519a496543d97a2b..bc49eb543a60012b8508f8f1b1ee05374593ef32 100755 --- a/ring-android/app/src/main/java/cx/ring/dependencyinjection/JamiInjectionComponent.java +++ b/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; diff --git a/ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.java index 0e5147747ee8b97bbfaa68e69184bde0baa5d8c4..251add4e1d0c50d0e0b2a057615af17959b5353c 100644 --- a/ring-android/app/src/main/java/cx/ring/fragments/LocationSharingFragment.java +++ b/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; diff --git a/ring-android/app/src/main/java/cx/ring/service/BootReceiver.java b/ring-android/app/src/main/java/cx/ring/service/BootReceiver.java index 3a15f5a51eb4fdd7c5ed09d8e9b1b8e5f1840c10..be69411d9f51b355d4df7450659a8f7880fd2927 100644 --- a/ring-android/app/src/main/java/cx/ring/service/BootReceiver.java +++ b/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(); diff --git a/ring-android/app/src/main/java/cx/ring/service/JamiJobService.java b/ring-android/app/src/main/java/cx/ring/service/JamiJobService.java index 57015f0d5cd2916ad47e4c7827e7e41501309650..a3ad53cef2542f60b1e7733817db78e1ced9c799 100644 --- a/ring-android/app/src/main/java/cx/ring/service/JamiJobService.java +++ b/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 diff --git a/ring-android/app/src/main/java/cx/ring/services/LocationSharingService.java b/ring-android/app/src/main/java/cx/ring/service/LocationSharingService.java similarity index 99% rename from ring-android/app/src/main/java/cx/ring/services/LocationSharingService.java rename to ring-android/app/src/main/java/cx/ring/service/LocationSharingService.java index 334b2da524f81641c472f733ba9bd6a1d2ce0b9c..7c583ec98792b71d7e9b0c6cae19bba5f7d1a075 100644 --- a/ring-android/app/src/main/java/cx/ring/services/LocationSharingService.java +++ b/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; diff --git a/ring-android/app/src/main/java/cx/ring/services/SyncService.java b/ring-android/app/src/main/java/cx/ring/service/SyncService.java similarity index 98% rename from ring-android/app/src/main/java/cx/ring/services/SyncService.java rename to ring-android/app/src/main/java/cx/ring/service/SyncService.java index d8fc61bfa41e17ba6b12bb15545237b1cdf33ce1..9b0ac420d07551bfdf0ded6d0b8fff288ef3c0e3 100644 --- a/ring-android/app/src/main/java/cx/ring/services/SyncService.java +++ b/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; diff --git a/ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.java b/ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.java index 1c80d880b1813229d3b9dfcc2d6a91864f482691..4b54c7d850e4fb7e9e2ce9944acefc57b26782e9 100644 --- a/ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.java +++ b/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";