Move unifiedpush files into main source set

mollyim · Nov 21, 2024 · 26d6bcf · 26d6bcf
1 parent 0423a23
commit 26d6bcf
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 51 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -122,10 +122,6 @@ android {
     getByName("androidTest") {
       java.srcDir("$projectDir/src/testShared")
     }
-
-    getByName("main") {
-      java.srcDir("$projectDir/src/unifiedpush/java")
-    }
   }
 
   compileOptions {

diff --git a/...fiedPushDefaultDistributorLinkActivity.kt → ...fiedPushDefaultDistributorLinkActivity.kt b/...fiedPushDefaultDistributorLinkActivity.kt → ...fiedPushDefaultDistributorLinkActivity.kt
@@ -1,8 +1,3 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package im.molly.unifiedpush
 
 import android.content.Context

diff --git a/...lly/unifiedpush/UnifiedPushDistributor.kt → ...lly/unifiedpush/UnifiedPushDistributor.kt b/...lly/unifiedpush/UnifiedPushDistributor.kt → ...lly/unifiedpush/UnifiedPushDistributor.kt
diff --git a/...iedpush/UnifiedPushNotificationBuilder.kt → ...iedpush/UnifiedPushNotificationBuilder.kt b/...iedpush/UnifiedPushNotificationBuilder.kt → ...iedpush/UnifiedPushNotificationBuilder.kt
diff --git a/...ifications/MollySocketQrScanRepository.kt → ...ifications/MollySocketQrScanRepository.kt b/...ifications/MollySocketQrScanRepository.kt → ...ifications/MollySocketQrScanRepository.kt
diff --git a/.../notifications/MollySocketQrScanScreen.kt → .../notifications/MollySocketQrScanScreen.kt b/.../notifications/MollySocketQrScanScreen.kt → .../notifications/MollySocketQrScanScreen.kt
diff --git a/...fications/MollySocketQrScannerActivity.kt → ...fications/MollySocketQrScannerActivity.kt b/...fications/MollySocketQrScannerActivity.kt → ...fications/MollySocketQrScannerActivity.kt
diff --git a/...ications/MollySocketQrScannerViewModel.kt → ...ications/MollySocketQrScannerViewModel.kt b/...ications/MollySocketQrScannerViewModel.kt → ...ications/MollySocketQrScannerViewModel.kt
diff --git a/...ettings/app/notifications/QrScanResult.kt → ...ettings/app/notifications/QrScanResult.kt b/...ettings/app/notifications/QrScanResult.kt → ...ettings/app/notifications/QrScanResult.kt
diff --git a/...ifications/UnifiedPushSettingsFragment.kt → ...ifications/UnifiedPushSettingsFragment.kt b/...ifications/UnifiedPushSettingsFragment.kt → ...ifications/UnifiedPushSettingsFragment.kt
diff --git a/...notifications/UnifiedPushSettingsState.kt → ...notifications/UnifiedPushSettingsState.kt b/...notifications/UnifiedPushSettingsState.kt → ...notifications/UnifiedPushSettingsState.kt
diff --git a/...fications/UnifiedPushSettingsViewModel.kt → ...fications/UnifiedPushSettingsViewModel.kt b/...fications/UnifiedPushSettingsViewModel.kt → ...fications/UnifiedPushSettingsViewModel.kt
@@ -8,13 +8,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import im.molly.unifiedpush.MollySocketRepository
-import im.molly.unifiedpush.jobs.UnifiedPushRefreshJob
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.jobs.UnifiedPushRefreshJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.concurrent.SerialMonoLifoExecutor
 import org.thoughtcrime.securesms.util.livedata.Store

diff --git a/...ly/unifiedpush/model/ConnectionRequest.kt → ...ly/unifiedpush/model/ConnectionRequest.kt b/...ly/unifiedpush/model/ConnectionRequest.kt → ...ly/unifiedpush/model/ConnectionRequest.kt
diff --git a/...ly/unifiedpush/model/MollySocketDevice.kt → ...ly/unifiedpush/model/MollySocketDevice.kt b/...ly/unifiedpush/model/MollySocketDevice.kt → ...ly/unifiedpush/model/MollySocketDevice.kt
diff --git a/...ifiedpush/receiver/UnifiedPushReceiver.kt → ...ifiedpush/receiver/UnifiedPushReceiver.kt b/...ifiedpush/receiver/UnifiedPushReceiver.kt → ...ifiedpush/receiver/UnifiedPushReceiver.kt
@@ -3,13 +3,13 @@ package im.molly.unifiedpush.receiver
 import android.content.Context
 import androidx.core.os.bundleOf
 import com.google.firebase.messaging.RemoteMessage
-import im.molly.unifiedpush.jobs.UnifiedPushRefreshJob
 import im.molly.unifiedpush.UnifiedPushNotificationBuilder
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.gcm.FcmFetchManager
 import org.thoughtcrime.securesms.gcm.FcmReceiveService
+import org.thoughtcrime.securesms.jobs.UnifiedPushRefreshJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.util.TextSecurePreferences

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -80,6 +80,7 @@
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
+import org.thoughtcrime.securesms.jobs.UnifiedPushRefreshJob;
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SettingsValues.NotificationDeliveryMethod;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -129,7 +130,6 @@
 import java.util.concurrent.TimeUnit;
 
 import im.molly.unifiedpush.UnifiedPushDistributor;
-import im.molly.unifiedpush.jobs.UnifiedPushRefreshJob;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -97,8 +97,6 @@
 import java.util.List;
 import java.util.Map;
 
-import im.molly.unifiedpush.jobs.UnifiedPushRefreshJob;
-
 public final class JobManagerFactories {
 
   public static Map<String, Job.Factory> getJobFactories(@NonNull Application application) {

diff --git a/...unifiedpush/jobs/UnifiedPushRefreshJob.kt → ...e/securesms/jobs/UnifiedPushRefreshJob.kt b/...unifiedpush/jobs/UnifiedPushRefreshJob.kt → ...e/securesms/jobs/UnifiedPushRefreshJob.kt
@@ -1,4 +1,4 @@
-package im.molly.unifiedpush.jobs
+package org.thoughtcrime.securesms.jobs
 
 import im.molly.unifiedpush.MollySocketRepository
 import im.molly.unifiedpush.MollySocketRepository.isLinked
@@ -14,8 +14,6 @@ import org.thoughtcrime.securesms.events.PushServiceEvent
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.JsonJobData
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
-import org.thoughtcrime.securesms.jobs.BaseJob
-import org.thoughtcrime.securesms.jobs.FcmRefreshJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException

diff --git a/...e/securesms/keyvalue/UnifiedPushValues.kt → ...e/securesms/keyvalue/UnifiedPushValues.kt b/...e/securesms/keyvalue/UnifiedPushValues.kt → ...e/securesms/keyvalue/UnifiedPushValues.kt
diff --git a/app/src/unifiedpush/java/im/molly/unifiedpush/model/MollySocket.kt b/app/src/unifiedpush/java/im/molly/unifiedpush/model/MollySocket.kt