From 05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:25:16 +0200 Subject: [PATCH] Rename package `im.vector.riotx` to `im.vector.app` (IDE, other variants) --- .../im/vector/{riotx => app}/FlavorCode.kt | 2 +- .../troubleshoot/TestFirebaseToken.kt | 14 +++++----- .../settings/troubleshoot/TestPlayServices.kt | 8 +++--- .../troubleshoot/TestTokenRegistration.kt | 14 +++++----- .../{riotx => app}/gplay/package-info.kt | 2 +- .../fcm/VectorFirebaseMessagingService.kt | 26 +++++++++---------- .../{riotx => app}/push/fcm/FcmHelper.kt | 10 +++---- ...ificationTroubleshootTestManagerFactory.kt | 18 ++++++------- .../features/debug/DebugMenuActivity.kt | 2 +- .../{riotx => app}/receivers/DebugReceiver.kt | 2 +- 10 files changed, 49 insertions(+), 49 deletions(-) rename vector/src/gplay/java/im/vector/{riotx => app}/FlavorCode.kt (97%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestFirebaseToken.kt (90%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestPlayServices.kt (91%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestTokenRegistration.kt (89%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/package-info.kt (95%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/push/fcm/VectorFirebaseMessagingService.kt (93%) rename vector/src/gplay/java/im/vector/{riotx => app}/push/fcm/FcmHelper.kt (95%) rename vector/src/gplay/java/im/vector/{riotx => app}/push/fcm/NotificationTroubleshootTestManagerFactory.kt (75%) rename vector/src/release/java/im/vector/{riotx => app}/features/debug/DebugMenuActivity.kt (94%) rename vector/src/release/java/im/vector/{riotx => app}/receivers/DebugReceiver.kt (96%) diff --git a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt b/vector/src/gplay/java/im/vector/app/FlavorCode.kt similarity index 97% rename from vector/src/gplay/java/im/vector/riotx/FlavorCode.kt rename to vector/src/gplay/java/im/vector/app/FlavorCode.kt index 109e9bc978..040296d755 100644 --- a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt +++ b/vector/src/gplay/java/im/vector/app/FlavorCode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.content.Context import android.content.Intent diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 90% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt index 3806893d98..318867af91 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.gplay.features.settings.troubleshoot +package im.vector.app.gplay.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import com.google.firebase.iid.FirebaseInstanceId -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.startAddGoogleAccountIntent -import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.startAddGoogleAccountIntent +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.push.fcm.FcmHelper import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 91% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt index c28a02d350..133fe1cb05 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.gplay.features.settings.troubleshoot +package im.vector.app.gplay.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.troubleshoot.TroubleshootTest import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 89% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt index 75e888dfb7..f7dd69f37d 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.gplay.features.settings.troubleshoot +package im.vector.app.gplay.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer import androidx.work.WorkInfo import androidx.work.WorkManager import im.vector.matrix.android.api.session.pushers.PusherState -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.pushers.PushersManager +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.push.fcm.FcmHelper import javax.inject.Inject /** diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt similarity index 95% rename from vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt rename to vector/src/gplay/java/im/vector/app/gplay/package-info.kt index 02e0382503..a37d300d52 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt @@ -17,4 +17,4 @@ /** * Code exclusively used by the GPlay build and not referenced on the main source code */ -package im.vector.riotx.gplay +package im.vector.app.gplay diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt similarity index 93% rename from vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt rename to vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt index 9fadbcafb6..677a146b46 100755 --- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt @@ -17,7 +17,7 @@ * limitations under the License. */ -package im.vector.riotx.gplay.push.fcm +package im.vector.app.gplay.push.fcm import android.os.Handler import android.os.Looper @@ -28,18 +28,18 @@ import com.google.firebase.messaging.RemoteMessage import im.vector.matrix.android.api.pushrules.rest.PushRule import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.Event -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.features.badge.BadgeProxy -import im.vector.riotx.features.notifications.NotifiableEventResolver -import im.vector.riotx.features.notifications.NotifiableMessageEvent -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.notifications.SimpleNotifiableEvent -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.badge.BadgeProxy +import im.vector.app.features.notifications.NotifiableEventResolver +import im.vector.app.features.notifications.NotifiableMessageEvent +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.notifications.SimpleNotifiableEvent +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.push.fcm.FcmHelper import timber.log.Timber /** diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt similarity index 95% rename from vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt rename to vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt index b04f9b3703..6c68d6c3b5 100755 --- a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt +++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.push.fcm +package im.vector.app.push.fcm import android.app.Activity import android.content.Context @@ -25,10 +25,10 @@ import androidx.core.content.edit import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability import com.google.firebase.iid.FirebaseInstanceId -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.settings.VectorPreferences import timber.log.Timber /** diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt similarity index 75% rename from vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt rename to vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt index 2830822918..b2dad09483 100644 --- a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.push.fcm +package im.vector.app.push.fcm import androidx.fragment.app.Fragment -import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager -import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings -import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings -import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings -import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings -import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken -import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices -import im.vector.riotx.gplay.features.settings.troubleshoot.TestTokenRegistration +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TestAccountSettings +import im.vector.app.features.settings.troubleshoot.TestDeviceSettings +import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings +import im.vector.app.features.settings.troubleshoot.TestSystemSettings +import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken +import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices +import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration import javax.inject.Inject class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings, diff --git a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt similarity index 94% rename from vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt rename to vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt index bd97cad9e5..c5db033a18 100644 --- a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt +++ b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.features.debug import androidx.appcompat.app.AppCompatActivity diff --git a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt similarity index 96% rename from vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt rename to vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt index 07baeababc..dfb221fbc5 100644 --- a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt +++ b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt @@ -16,7 +16,7 @@ @file:Suppress("UNUSED_PARAMETER") -package im.vector.riotx.receivers +package im.vector.app.receivers import android.content.BroadcastReceiver import android.content.Context