diff --git a/app/build.gradle b/app/build.gradle index eaf1bf60..05d81bd8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,6 @@ buildscript { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'com.diffplug.spotless' apply plugin: 'com.github.triplet.play' @@ -74,6 +73,9 @@ android { } } } + buildFeatures { + viewBinding true + } compileOptions { coreLibraryDesugaringEnabled true sourceCompatibility = JavaVersion.VERSION_1_8 @@ -83,13 +85,12 @@ android { jvmTarget = JavaVersion.VERSION_1_8 } packagingOptions { - exclude 'META-INF/*' - } - lintOptions { - checkAllWarnings true - warningsAsErrors true - abortOnError true - lintConfig file('lint.xml') + jniLibs { + excludes += ['META-INF/*'] + } + resources { + excludes += ['META-INF/*'] + } } sourceSets { androidTest { @@ -101,6 +102,13 @@ android { resources.srcDirs += "src/sharedTest/resources" } } + lint { + abortOnError true + checkAllWarnings true + lintConfig file('lint.xml') + warningsAsErrors true + } + namespace 'tech.relaycorp.courier' } dependencies { @@ -124,11 +132,11 @@ dependencies { kapt 'com.google.dagger:dagger-compiler:2.43.2' // Awala - implementation 'tech.relaycorp:awala:1.66.3' - implementation 'tech.relaycorp:cogrpc:1.1.27' - implementation 'tech.relaycorp:cogrpc-okhttp:1.1.15' - implementation 'tech.relaycorp:doh:1.0.13' - testImplementation "tech.relaycorp:awala-testing:1.5.8" + implementation 'tech.relaycorp:awala:1.66.4' + implementation 'tech.relaycorp:cogrpc:1.1.29' + implementation 'tech.relaycorp:cogrpc-okhttp:1.1.16' + implementation 'tech.relaycorp:doh:1.0.21' + testImplementation "tech.relaycorp:awala-testing:1.5.10" // ORM implementation "androidx.room:room-runtime:$roomVersion" diff --git a/app/firebase-test-lab.yml b/app/firebase-test-lab.yml index 27c63665..73b39141 100644 --- a/app/firebase-test-lab.yml +++ b/app/firebase-test-lab.yml @@ -4,8 +4,8 @@ spec: test: app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk timeout: 30m device: - # Nexus 5X (virtual) - - model: Nexus5X + # Nexus 6 (virtual) + - model: Nexus6 version: 24 # Android 7.0 locale: en orientation: portrait diff --git a/app/lint.xml b/app/lint.xml index 3024b217..0334d4ed 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -6,6 +6,7 @@ + @@ -20,5 +21,6 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fdfb8abd..e43b14e7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/tech/relaycorp/cogrpc/server/CogRPCServer.kt b/app/src/main/java/tech/relaycorp/cogrpc/server/CogRPCServer.kt index 828d62e9..d229b43b 100644 --- a/app/src/main/java/tech/relaycorp/cogrpc/server/CogRPCServer.kt +++ b/app/src/main/java/tech/relaycorp/cogrpc/server/CogRPCServer.kt @@ -15,9 +15,8 @@ import java.net.InetSocketAddress import java.security.Security import java.util.concurrent.TimeUnit import java.util.logging.Level -import kotlin.math.roundToLong -import kotlin.time.minutes -import kotlin.time.seconds +import kotlin.time.Duration.Companion.minutes +import kotlin.time.Duration.Companion.seconds class CogRPCServer internal constructor( @@ -54,12 +53,9 @@ internal constructor( .maxInboundMessageSize(MAX_MESSAGE_SIZE) .maxInboundMetadataSize(MAX_METADATA_SIZE) .maxConcurrentCallsPerConnection(MAX_CONCURRENT_CALLS_PER_CONNECTION) - .maxConnectionAge(MAX_CONNECTION_AGE.inSeconds.roundToLong(), TimeUnit.SECONDS) - .maxConnectionAgeGrace( - MAX_CONNECTION_AGE_GRACE.inSeconds.roundToLong(), - TimeUnit.SECONDS - ) - .maxConnectionIdle(MAX_CONNECTION_IDLE.inSeconds.roundToLong(), TimeUnit.SECONDS) + .maxConnectionAge(MAX_CONNECTION_AGE.inWholeSeconds, TimeUnit.SECONDS) + .maxConnectionAgeGrace(MAX_CONNECTION_AGE_GRACE.inWholeSeconds, TimeUnit.SECONDS) + .maxConnectionIdle(MAX_CONNECTION_IDLE.inWholeSeconds, TimeUnit.SECONDS) .useTransportSecurity( certGenerator.exportCertificate().inputStream(), certGenerator.exportPrivateKey().inputStream() @@ -83,7 +79,7 @@ internal constructor( fun stop() { server ?.shutdown() - ?.awaitTermination(TERMINATION_TIMEOUT.inSeconds.toLong(), TimeUnit.SECONDS) + ?.awaitTermination(TERMINATION_TIMEOUT.inWholeSeconds, TimeUnit.SECONDS) server = null job.cancel() diff --git a/app/src/main/java/tech/relaycorp/courier/AppModule.kt b/app/src/main/java/tech/relaycorp/courier/AppModule.kt index 9850ebae..cfc7fbb9 100644 --- a/app/src/main/java/tech/relaycorp/courier/AppModule.kt +++ b/app/src/main/java/tech/relaycorp/courier/AppModule.kt @@ -33,7 +33,7 @@ class AppModule( @Provides fun wifiApState(): WifiApStateAvailability = - if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) { + if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S_V2) { WifiApStateAvailability.Available } else { WifiApStateAvailability.Unavailable diff --git a/app/src/main/java/tech/relaycorp/courier/data/disk/DiskStats.kt b/app/src/main/java/tech/relaycorp/courier/data/disk/DiskStats.kt index 3d3e00b0..b1259726 100644 --- a/app/src/main/java/tech/relaycorp/courier/data/disk/DiskStats.kt +++ b/app/src/main/java/tech/relaycorp/courier/data/disk/DiskStats.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.withContext import tech.relaycorp.courier.data.model.StorageSize import javax.inject.Inject -import kotlin.time.seconds +import kotlin.time.Duration.Companion.seconds class DiskStats @Inject constructor() { diff --git a/app/src/main/java/tech/relaycorp/courier/domain/PublicSync.kt b/app/src/main/java/tech/relaycorp/courier/domain/PublicSync.kt index 1a622d36..3d46e11a 100644 --- a/app/src/main/java/tech/relaycorp/courier/domain/PublicSync.kt +++ b/app/src/main/java/tech/relaycorp/courier/domain/PublicSync.kt @@ -9,8 +9,8 @@ import tech.relaycorp.courier.domain.client.CargoDelivery import tech.relaycorp.doh.DoHClient import java.util.logging.Level import javax.inject.Inject -import kotlin.time.seconds import tech.relaycorp.courier.domain.client.InternetAddressResolver +import kotlin.time.Duration.Companion.seconds class PublicSync @Inject constructor( diff --git a/app/src/main/java/tech/relaycorp/courier/ui/BaseActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/BaseActivity.kt index 8a35875f..77aaef90 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/BaseActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/BaseActivity.kt @@ -4,11 +4,11 @@ import android.os.Build import android.os.Bundle import android.view.View import android.view.WindowManager +import android.widget.TextView import androidx.annotation.DrawableRes import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.common_app_bar.appBar -import kotlinx.android.synthetic.main.common_app_bar.toolbar -import kotlinx.android.synthetic.main.common_app_bar.toolbarTitle +import androidx.appcompat.widget.Toolbar +import com.google.android.material.appbar.AppBarLayout import tech.relaycorp.courier.App import tech.relaycorp.courier.R import tech.relaycorp.courier.ui.common.Insets.addSystemWindowInsetToPadding @@ -21,6 +21,10 @@ abstract class BaseActivity : AppCompatActivity() { protected val messageManager by lazy { MessageManager(this) } + private val appBar get() = findViewById(R.id.appBar) + private val toolbar get() = findViewById(R.id.toolbar) + private val toolbarTitle get() = findViewById(R.id.toolbarTitle) + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -35,8 +39,8 @@ abstract class BaseActivity : AppCompatActivity() { } } - override fun setContentView(layoutResID: Int) { - super.setContentView(layoutResID) + override fun setContentView(view: View?) { + super.setContentView(view) toolbarTitle?.text = title appBar?.addSystemWindowInsetToPadding(top = true) } diff --git a/app/src/main/java/tech/relaycorp/courier/ui/main/MainActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/main/MainActivity.kt index d0c4006a..8c7336c9 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/main/MainActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/main/MainActivity.kt @@ -4,27 +4,13 @@ import android.os.Bundle import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import kotlinx.android.synthetic.main.activity_main.hotspotIcon -import kotlinx.android.synthetic.main.activity_main.hotspotLabel -import kotlinx.android.synthetic.main.activity_main.innerContainer -import kotlinx.android.synthetic.main.activity_main.internetIcon -import kotlinx.android.synthetic.main.activity_main.internetLabel -import kotlinx.android.synthetic.main.activity_main.lowStorageMessage -import kotlinx.android.synthetic.main.activity_main.settings -import kotlinx.android.synthetic.main.activity_main.storageProgress -import kotlinx.android.synthetic.main.activity_main.storageValues -import kotlinx.android.synthetic.main.activity_main.syncInternetButton -import kotlinx.android.synthetic.main.activity_main.syncInternetLayout -import kotlinx.android.synthetic.main.activity_main.syncInternetMessage -import kotlinx.android.synthetic.main.activity_main.syncPeopleButton -import kotlinx.android.synthetic.main.activity_main.syncPeopleLayout -import kotlinx.android.synthetic.main.activity_main.syncPeopleMessage import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import tech.relaycorp.courier.R import tech.relaycorp.courier.background.WifiHotspotState import tech.relaycorp.courier.common.di.ViewModelFactory import tech.relaycorp.courier.data.model.StorageUsage +import tech.relaycorp.courier.databinding.ActivityMainBinding import tech.relaycorp.courier.ui.BaseActivity import tech.relaycorp.courier.ui.common.Insets.addSystemWindowInsetToPadding import tech.relaycorp.courier.ui.common.format @@ -42,16 +28,19 @@ class MainActivity : BaseActivity() { ViewModelProvider(this, viewModelFactory).get(MainViewModel::class.java) } + private lateinit var binding: ActivityMainBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) component.inject(this) setTitle(R.string.main_title) - setContentView(R.layout.activity_main) - innerContainer.addSystemWindowInsetToPadding(bottom = true) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.innerContainer.addSystemWindowInsetToPadding(bottom = true) - settings.setOnClickListener { openSettings() } - syncPeopleButton.setOnClickListener { openSyncWithPeople() } - syncInternetButton.setOnClickListener { openSyncWithInternet() } + binding.settings.setOnClickListener { openSettings() } + binding.syncPeopleButton.setOnClickListener { openSyncWithPeople() } + binding.syncInternetButton.setOnClickListener { openSyncWithInternet() } viewModel .storageUsage() @@ -60,7 +49,7 @@ class MainActivity : BaseActivity() { viewModel .lowStorageMessageIsVisible() - .onEach { lowStorageMessage.isVisible = it } + .onEach { binding.lowStorageMessage.isVisible = it } .launchIn(lifecycleScope) viewModel @@ -84,8 +73,8 @@ class MainActivity : BaseActivity() { } private fun updateStorageUsage(usage: StorageUsage) { - storageProgress.progress = usage.percentage - storageValues.text = getString( + binding.storageProgress.progress = usage.percentage + binding.storageValues.text = getString( R.string.main_storage_usage_values, usage.usedByApp.format(this), usage.actualMax.format(this) @@ -94,18 +83,18 @@ class MainActivity : BaseActivity() { private fun updateSyncPeopleState(state: MainViewModel.SyncPeopleState) { val isEnabled = state is MainViewModel.SyncPeopleState.Enabled - syncPeopleLayout.isEnabled = isEnabled - syncPeopleButton.isEnabled = isEnabled - syncPeopleMessage.setText( + binding.syncPeopleLayout.isEnabled = isEnabled + binding.syncPeopleButton.isEnabled = isEnabled + binding.syncPeopleMessage.setText( if (isEnabled) R.string.sync_people_enabled else R.string.sync_people_disabled ) - hotspotLabel.isVisible = isEnabled - hotspotIcon.isVisible = isEnabled + binding.hotspotLabel.isVisible = isEnabled + binding.hotspotIcon.isVisible = isEnabled if (state is MainViewModel.SyncPeopleState.Enabled) { val isHotspotEnabled = state.hotspotState == WifiHotspotState.Enabled - hotspotIcon.isActivated = isHotspotEnabled - hotspotLabel.setText( + binding.hotspotIcon.isActivated = isHotspotEnabled + binding.hotspotLabel.setText( if (isHotspotEnabled) R.string.hotspot_on else R.string.hotspot_off ) } @@ -113,9 +102,9 @@ class MainActivity : BaseActivity() { private fun updateSyncInternetState(state: MainViewModel.SyncInternetState) { val isEnabled = state is MainViewModel.SyncInternetState.Enabled - syncInternetLayout.isEnabled = isEnabled - syncInternetButton.isEnabled = isEnabled - syncInternetMessage.setText( + binding.syncInternetLayout.isEnabled = isEnabled + binding.syncInternetButton.isEnabled = isEnabled + binding.syncInternetMessage.setText( when (state) { is MainViewModel.SyncInternetState.Enabled -> R.string.sync_internet_enabled is MainViewModel.SyncInternetState.Disabled.Offline -> R.string.sync_internet_disabled_offline @@ -124,9 +113,9 @@ class MainActivity : BaseActivity() { } ) - internetLabel.isVisible = isEnabled - internetIcon.isVisible = isEnabled - internetIcon.isActivated = isEnabled + binding.internetLabel.isVisible = isEnabled + binding.internetIcon.isVisible = isEnabled + binding.internetIcon.isActivated = isEnabled } private fun openSettings() { diff --git a/app/src/main/java/tech/relaycorp/courier/ui/settings/SettingsActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/settings/SettingsActivity.kt index c72c4941..86ac4f5c 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/settings/SettingsActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/settings/SettingsActivity.kt @@ -8,22 +8,13 @@ import android.os.Bundle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.mikepenz.aboutlibraries.LibsBuilder -import kotlinx.android.synthetic.main.activity_settings.deleteData -import kotlinx.android.synthetic.main.activity_settings.innerContainer -import kotlinx.android.synthetic.main.activity_settings.knowMore -import kotlinx.android.synthetic.main.activity_settings.licenses -import kotlinx.android.synthetic.main.activity_settings.storageAvailable -import kotlinx.android.synthetic.main.activity_settings.storageMaxSlider -import kotlinx.android.synthetic.main.activity_settings.storageMaxValue -import kotlinx.android.synthetic.main.activity_settings.storageTotal -import kotlinx.android.synthetic.main.activity_settings.storageUsed -import kotlinx.android.synthetic.main.activity_settings.version import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.take import tech.relaycorp.courier.BuildConfig import tech.relaycorp.courier.R import tech.relaycorp.courier.common.di.ViewModelFactory +import tech.relaycorp.courier.databinding.ActivitySettingsBinding import tech.relaycorp.courier.ui.BaseActivity import tech.relaycorp.courier.ui.common.Insets.addSystemWindowInsetToPadding import tech.relaycorp.courier.ui.common.format @@ -39,53 +30,56 @@ class SettingsActivity : BaseActivity() { ViewModelProvider(this, viewModelFactory).get(SettingsViewModel::class.java) } + private lateinit var binding: ActivitySettingsBinding + private var deleteDataDialog: AlertDialog? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) component.inject(this) - setContentView(R.layout.activity_settings) + binding = ActivitySettingsBinding.inflate(layoutInflater) + setContentView(binding.root) setupNavigation(R.drawable.ic_close) - innerContainer.addSystemWindowInsetToPadding(bottom = true) + binding.innerContainer.addSystemWindowInsetToPadding(bottom = true) - version.text = + binding.version.text = getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) - knowMore.setOnClickListener { openKnowMore() } - licenses.setOnClickListener { openLicenses() } - deleteData.setOnClickListener { openDeleteDataDialog() } + binding.knowMore.setOnClickListener { openKnowMore() } + binding.licenses.setOnClickListener { openLicenses() } + binding.deleteData.setOnClickListener { openDeleteDataDialog() } viewModel .deleteDataEnabled() - .onEach { deleteData.set(it) } + .onEach { binding.deleteData.set(it) } .launchIn(lifecycleScope) viewModel .storageStats() .onEach { - storageUsed.text = it.used.format(this) - storageAvailable.text = it.available.format(this) - storageTotal.text = it.total.format(this) + binding.storageUsed.text = it.used.format(this) + binding.storageAvailable.text = it.available.format(this) + binding.storageTotal.text = it.total.format(this) } .launchIn(lifecycleScope) viewModel .maxStorageBoundary() - .onEach { storageMaxSlider.sizeBoundary = it } + .onEach { binding.storageMaxSlider.sizeBoundary = it } .launchIn(lifecycleScope) - storageMaxSlider.addOnChangeListener { _, _, _ -> - viewModel.maxStorageChanged(storageMaxSlider.size) + binding.storageMaxSlider.addOnChangeListener { _, _, _ -> + viewModel.maxStorageChanged(binding.storageMaxSlider.size) } viewModel.maxStorage() .take(1) - .onEach { storageMaxSlider.size = it } + .onEach { binding.storageMaxSlider.size = it } .launchIn(lifecycleScope) viewModel .maxStorage() - .onEach { storageMaxValue.text = it.format(this) } + .onEach { binding.storageMaxValue.text = it.format(this) } .launchIn(lifecycleScope) } diff --git a/app/src/main/java/tech/relaycorp/courier/ui/sync/internet/InternetSyncActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/sync/internet/InternetSyncActivity.kt index 57dc3406..abe521ac 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/sync/internet/InternetSyncActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/sync/internet/InternetSyncActivity.kt @@ -8,10 +8,6 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.android.synthetic.main.activity_internet_sync.animation -import kotlinx.android.synthetic.main.activity_internet_sync.close -import kotlinx.android.synthetic.main.activity_internet_sync.stateMessage -import kotlinx.android.synthetic.main.activity_internet_sync.stop import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map @@ -19,6 +15,7 @@ import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach import tech.relaycorp.courier.R import tech.relaycorp.courier.common.di.ViewModelFactory +import tech.relaycorp.courier.databinding.ActivityInternetSyncBinding import tech.relaycorp.courier.domain.PublicSync import tech.relaycorp.courier.ui.BaseActivity import tech.relaycorp.courier.ui.common.Insets.addSystemWindowInsetToMargin @@ -35,33 +32,36 @@ class InternetSyncActivity : BaseActivity() { ViewModelProvider(this, viewModelFactory).get(InternetSyncViewModel::class.java) } + private lateinit var binding: ActivityInternetSyncBinding + private var stopConfirmDialog: AlertDialog? = null override fun onCreate(savedInstanceState: Bundle?) { component.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.activity_internet_sync) - stop.addSystemWindowInsetToMargin(bottom = true) - close.addSystemWindowInsetToMargin(bottom = true) + binding = ActivityInternetSyncBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.stop.addSystemWindowInsetToMargin(bottom = true) + binding.close.addSystemWindowInsetToMargin(bottom = true) - stop.setOnClickListener { showStopConfirmDialog() } - close.setOnClickListener { finish() } + binding.stop.setOnClickListener { showStopConfirmDialog() } + binding.close.setOnClickListener { finish() } viewModel .state - .onEach { stateMessage.setText(it.toStringRes()) } + .onEach { binding.stateMessage.setText(it.toStringRes()) } .map { it != PublicSync.State.Finished && it != PublicSync.State.Error } .distinctUntilChanged() .onEach { isSyncing -> - stop.isVisible = isSyncing - close.isVisible = !isSyncing + binding.stop.isVisible = isSyncing + binding.close.isVisible = !isSyncing if (isSyncing) { - animation.startLoopingAvd(R.drawable.ic_sync_animation) + binding.animation.startLoopingAvd(R.drawable.ic_sync_animation) } else { - animation.stopLoopingAvd() + binding.animation.stopLoopingAvd() } } - .onCompletion { animation.stopLoopingAvd() } + .onCompletion { binding.animation.stopLoopingAvd() } .launchIn(lifecycleScope) viewModel @@ -71,7 +71,7 @@ class InternetSyncActivity : BaseActivity() { } override fun onBackPressed() { - stop.performClick() + binding.stop.performClick() } override fun onDestroy() { diff --git a/app/src/main/java/tech/relaycorp/courier/ui/sync/people/HotspotInstructionsActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/sync/people/HotspotInstructionsActivity.kt index 0218c6c8..569b3584 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/sync/people/HotspotInstructionsActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/sync/people/HotspotInstructionsActivity.kt @@ -7,15 +7,11 @@ import android.os.Bundle import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope -import kotlinx.android.synthetic.main.activity_hotspot_instructions.icon -import kotlinx.android.synthetic.main.activity_hotspot_instructions.openSettings -import kotlinx.android.synthetic.main.activity_hotspot_instructions.startSync -import kotlinx.android.synthetic.main.activity_hotspot_instructions.text -import kotlinx.android.synthetic.main.activity_hotspot_instructions.titleText import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import tech.relaycorp.courier.R import tech.relaycorp.courier.common.di.ViewModelFactory +import tech.relaycorp.courier.databinding.ActivityHotspotInstructionsBinding import tech.relaycorp.courier.ui.BaseActivity import javax.inject.Inject @@ -28,14 +24,17 @@ class HotspotInstructionsActivity : BaseActivity() { ViewModelProvider(this, viewModelFactory).get(HotspotInstructionsViewModel::class.java) } + private lateinit var binding: ActivityHotspotInstructionsBinding + override fun onCreate(savedInstanceState: Bundle?) { component.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.activity_hotspot_instructions) + binding = ActivityHotspotInstructionsBinding.inflate(layoutInflater) + setContentView(binding.root) setupNavigation() - openSettings.setOnClickListener { openHotspotSettings() } - startSync.setOnClickListener { openPeopleSync() } + binding.openSettings.setOnClickListener { openHotspotSettings() } + binding.startSync.setOnClickListener { openPeopleSync() } viewModel .state() @@ -44,21 +43,21 @@ class HotspotInstructionsActivity : BaseActivity() { } private fun updateState(state: HotspotInstructionsViewModel.State) { - icon.isActivated = state == HotspotInstructionsViewModel.State.ReadyToSync - titleText.setText( + binding.icon.isActivated = state == HotspotInstructionsViewModel.State.ReadyToSync + binding.titleText.setText( when (state) { HotspotInstructionsViewModel.State.ReadyToSync -> R.string.hotspot_instructions_enabled HotspotInstructionsViewModel.State.NotReadyToSync -> R.string.hotspot_instructions_disabled } ) - text.setText( + binding.text.setText( when (state) { HotspotInstructionsViewModel.State.ReadyToSync -> R.string.hotspot_instructions_enabled_text HotspotInstructionsViewModel.State.NotReadyToSync -> R.string.hotspot_instructions_disabled_text } ) - openSettings.isVisible = state == HotspotInstructionsViewModel.State.NotReadyToSync - startSync.isVisible = state == HotspotInstructionsViewModel.State.ReadyToSync + binding.openSettings.isVisible = state == HotspotInstructionsViewModel.State.NotReadyToSync + binding.startSync.isVisible = state == HotspotInstructionsViewModel.State.ReadyToSync } private fun openHotspotSettings() { diff --git a/app/src/main/java/tech/relaycorp/courier/ui/sync/people/PeopleSyncActivity.kt b/app/src/main/java/tech/relaycorp/courier/ui/sync/people/PeopleSyncActivity.kt index c13c9858..483a35e7 100644 --- a/app/src/main/java/tech/relaycorp/courier/ui/sync/people/PeopleSyncActivity.kt +++ b/app/src/main/java/tech/relaycorp/courier/ui/sync/people/PeopleSyncActivity.kt @@ -9,16 +9,12 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.android.synthetic.main.activity_people_sync.animation -import kotlinx.android.synthetic.main.activity_people_sync.clientsConnected -import kotlinx.android.synthetic.main.activity_people_sync.close -import kotlinx.android.synthetic.main.activity_people_sync.stop -import kotlinx.android.synthetic.main.activity_people_sync.syncMessage import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach import tech.relaycorp.courier.R import tech.relaycorp.courier.common.di.ViewModelFactory +import tech.relaycorp.courier.databinding.ActivityPeopleSyncBinding import tech.relaycorp.courier.ui.BaseActivity import tech.relaycorp.courier.ui.common.Insets.addSystemWindowInsetToMargin import tech.relaycorp.courier.ui.common.startLoopingAvd @@ -34,40 +30,43 @@ class PeopleSyncActivity : BaseActivity() { ViewModelProvider(this, viewModelFactory).get(PeopleSyncViewModel::class.java) } + private lateinit var binding: ActivityPeopleSyncBinding + private var stopConfirmDialog: AlertDialog? = null override fun onCreate(savedInstanceState: Bundle?) { component.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.activity_people_sync) - stop.addSystemWindowInsetToMargin(bottom = true) - close.addSystemWindowInsetToMargin(bottom = true) + binding = ActivityPeopleSyncBinding.inflate(layoutInflater) + setContentView(binding.root) + binding.stop.addSystemWindowInsetToMargin(bottom = true) + binding.close.addSystemWindowInsetToMargin(bottom = true) - stop.setOnClickListener { viewModel.stopClicked() } - close.setOnClickListener { finish() } + binding.stop.setOnClickListener { viewModel.stopClicked() } + binding.close.setOnClickListener { finish() } viewModel .state() .onEach { state -> - syncMessage.setText(state.toSyncMessageRes()) + binding.syncMessage.setText(state.toSyncMessageRes()) - clientsConnected.isInvisible = + binding.clientsConnected.isInvisible = state !is PeopleSyncViewModel.State.Syncing.HadFirstClient - clientsConnected.text = state.clientsConnectedValue.toString() + binding.clientsConnected.text = state.clientsConnectedValue.toString() - stop.isInvisible = state !is PeopleSyncViewModel.State.Syncing - close.isVisible = state == PeopleSyncViewModel.State.Error + binding.stop.isInvisible = state !is PeopleSyncViewModel.State.Syncing + binding.close.isVisible = state == PeopleSyncViewModel.State.Error when { state is PeopleSyncViewModel.State.Syncing.HadFirstClient && state.clientsConnected > 0 -> - animation.startLoopingAvd(R.drawable.ic_sync_animation_fast) + binding.animation.startLoopingAvd(R.drawable.ic_sync_animation_fast) state is PeopleSyncViewModel.State.Syncing -> - animation.startLoopingAvd(R.drawable.ic_sync_animation) + binding.animation.startLoopingAvd(R.drawable.ic_sync_animation) else -> - animation.stopLoopingAvd() + binding.animation.stopLoopingAvd() } } - .onCompletion { animation.stopLoopingAvd() } + .onCompletion { binding.animation.stopLoopingAvd() } .launchIn(lifecycleScope) viewModel @@ -92,7 +91,7 @@ class PeopleSyncActivity : BaseActivity() { } override fun onBackPressed() { - stop.performClick() + binding.stop.performClick() } override fun onDestroy() { diff --git a/build.gradle b/build.gradle index 98c5d3e5..a77adf6a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlinVersion = '1.6.21' + kotlinVersion = '1.8.10' kotlinCoroutinesVersion = '1.6.4' grpcVersion = '1.49.0' protobufVersion = '3.21.2' @@ -18,7 +18,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.7.2' classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053..943f0cbf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51361b36..f398c33c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 10 12:24:05 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/gradlew b/gradlew index fbd7c515..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@"