Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 00:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix gradle format task.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-02-16 14:22:44 -05:00
committed by Alex Hart
parent 9cefe0bc04
commit b48b1f031e
57 changed files with 164 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
feature/registration/src/main/java/org/signal/registration/RegistrationActivity.kt
View File

@@ -6,7 +6,6 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContract
import androidx.activity.viewModels
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier

1
feature/registration/src/main/java/org/signal/registration/RegistrationFlowState.kt
View File

@@ -38,4 +38,3 @@ data class RegistrationFlowState(
/** If true, do not attempt any flows where we generate RRP's. Create a session instead. */
val doNotAttemptRecoveryPassword: Boolean = false
) : Parcelable

7
feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt
View File

@@ -26,10 +26,7 @@ import org.signal.registration.RegistrationFlowState
import org.signal.registration.RegistrationRepository
import org.signal.registration.RegistrationRoute
import org.signal.registration.screens.phonenumber.PhoneNumberEntryState.OneTimeEvent
import org.signal.registration.screens.phonenumber.PhoneNumberEntryState.OneTimeEvent.*
import org.signal.registration.screens.util.navigateTo
import org.signal.registration.screens.verificationcode.VerificationCodeState
import org.signal.registration.screens.verificationcode.VerificationCodeViewModel
class PhoneNumberEntryViewModel(
val repository: RegistrationRepository,
@@ -101,7 +98,7 @@ class PhoneNumberEntryViewModel(
@VisibleForTesting
fun applyParentState(state: PhoneNumberEntryState, parentState: RegistrationFlowState): PhoneNumberEntryState {
return state.copy(
sessionE164 = parentState.sessionE164,
sessionE164 = parentState.sessionE164,
sessionMetadata = parentState.sessionMetadata,
preExistingRegistrationData = parentState.preExistingRegistrationData,
restoredSvrCredentials = state.restoredSvrCredentials.takeUnless { parentState.doNotAttemptRecoveryPassword } ?: emptyList()
@@ -238,7 +235,7 @@ class PhoneNumberEntryViewModel(
if (state.restoredSvrCredentials.isNotEmpty()) {
when (val result = repository.checkSvrCredentials(e164, state.restoredSvrCredentials)) {
is NetworkController.RegistrationNetworkResult.Success -> {
Log.i(TAG, "[CheckSVRCredentials] Successfully validated credentials for ${e164}.")
Log.i(TAG, "[CheckSVRCredentials] Successfully validated credentials for $e164.")
val credential = result.data.validCredential
if (credential != null) {
parentEventEmitter(RegistrationFlowEvent.E164Chosen(e164))

2
feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSmsBypassViewModel.kt
View File

@@ -217,7 +217,7 @@ class PinEntryForSmsBypassViewModel(
override fun <T : ViewModel> create(modelClass: Class<T>): T {
return PinEntryForSmsBypassViewModel(
repository = repository,
parentState = parentState,
parentState = parentState,
parentEventEmitter = parentEventEmitter,
svrCredentials = svrCredentials
) as T

2
feature/registration/src/main/java/org/signal/registration/util/ACIParceler.kt
View File

@@ -17,4 +17,4 @@ class ACIParceler : Parceler<ServiceId.ACI> {
override fun create(parcel: Parcel): ServiceId.ACI {
return ServiceId.ACI.parseOrThrow(parcel.createByteArray())
}
}
}

2
feature/registration/src/main/java/org/signal/registration/util/KyberPreKeyRecordParceler.kt
View File

@@ -17,4 +17,4 @@ class KyberPreKeyRecordParceler : Parceler<KyberPreKeyRecord> {
override fun create(parcel: Parcel): KyberPreKeyRecord {
return KyberPreKeyRecord(parcel.createByteArray())
}
}
}

1
feature/registration/src/main/java/org/signal/registration/util/MasterKeyParceler.kt
View File

@@ -19,4 +19,3 @@ object MasterKeyParceler : Parceler<MasterKey?> {
parcel.writeByteArray(this?.serialize())
}
}

2
feature/registration/src/main/java/org/signal/registration/util/PNIParceler.kt
View File

@@ -17,4 +17,4 @@ class PNIParceler : Parceler<ServiceId.PNI> {
override fun create(parcel: Parcel): ServiceId.PNI {
return ServiceId.PNI.parseOrThrow(parcel.createByteArray())
}
}
}

2
feature/registration/src/main/java/org/signal/registration/util/SensitiveLog.kt
View File

@@ -42,4 +42,4 @@ object SensitiveLog : Log.Logger() {
override fun flush() {
this.logger.flush()
}
}
}

2
feature/registration/src/main/java/org/signal/registration/util/SignedPreKeyRecordParceler.kt
View File

@@ -17,4 +17,4 @@ class SignedPreKeyRecordParceler : Parceler<SignedPreKeyRecord> {
override fun create(parcel: Parcel): SignedPreKeyRecord {
return SignedPreKeyRecord(parcel.createByteArray())
}
}
}

2
feature/registration/src/test/java/org/signal/registration/RegistrationNavigationTest.kt
View File

@@ -7,11 +7,11 @@ package org.signal.registration
import android.app.Application
import androidx.compose.ui.test.assertIsDisplayed
import androidx.test.core.app.ApplicationProvider
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.lifecycle.SavedStateHandle
import androidx.test.core.app.ApplicationProvider
import com.google.accompanist.permissions.ExperimentalPermissionsApi
import io.mockk.mockk
import org.junit.Before

2
feature/registration/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberScreenTest.kt
View File

@@ -7,11 +7,11 @@ package org.signal.registration.screens.phonenumber
import android.app.Application
import androidx.compose.ui.test.assertIsEnabled
import androidx.test.core.app.ApplicationProvider
import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

2
feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenTest.kt
View File

@@ -7,12 +7,12 @@ package org.signal.registration.screens.verificationcode
import android.app.Application
import androidx.compose.ui.test.assertIsDisplayed
import androidx.test.core.app.ApplicationProvider
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import androidx.test.core.app.ApplicationProvider
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith

2
feature/registration/src/test/java/org/signal/registration/screens/welcome/WelcomeScreenTest.kt
View File

@@ -7,10 +7,10 @@ package org.signal.registration.screens.welcome
import android.app.Application
import androidx.compose.ui.test.assertIsDisplayed
import androidx.test.core.app.ApplicationProvider
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith