Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

[detox] Stop blocking instances

This commit is contained in:
kyori19 2023-06-10 11:21:53 +09:00
parent c3eb712d6c
commit e0126519e0
No known key found for this signature in database
GPG Key ID: F7BDE7DD42BF366A
4 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt
View File

@ -39,8 +39,6 @@ import com.keylesspalace.tusky.entity.AccessToken
import com.keylesspalace.tusky.network.MastodonApi
import com.keylesspalace.tusky.util.getNonNullString
import com.keylesspalace.tusky.util.openLinkInCustomTab
import com.keylesspalace.tusky.util.rickRoll
import com.keylesspalace.tusky.util.shouldRickRoll
import com.keylesspalace.tusky.util.viewBinding
import kotlinx.coroutines.launch
import okhttp3.HttpUrl
@ -160,11 +158,6 @@ class LoginActivity : BaseActivity(), Injectable {
return
}
if (shouldRickRoll(this, domain)) {
rickRoll(this)
return
}
setLoading(true)
lifecycleScope.launch {

20
app/src/main/java/com/keylesspalace/tusky/util/RickRoll.kt
View File

@ -1,20 +0,0 @@
package com.keylesspalace.tusky.util
import android.content.Context
import android.content.Intent
import android.net.Uri
import com.keylesspalace.tusky.R
fun shouldRickRoll(context: Context, domain: String) =
context.resources.getStringArray(R.array.rick_roll_domains).any { candidate ->
domain.equals(candidate, true) || domain.endsWith(".$candidate", true)
}
fun rickRoll(context: Context) {
val uri = Uri.parse(context.getString(R.string.rick_roll_url))
val intent = Intent(Intent.ACTION_VIEW, uri).apply {
addCategory(Intent.CATEGORY_BROWSABLE)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
context.startActivity(intent)
}

8
app/src/main/res/values/donottranslate.xml
View File

@ -162,14 +162,6 @@
%1$s; %2$s; %3$s, %15$s %4$s, %5$s, %6$s; %7$s, %8$s, %9$s, %10$s, %11$s; %12$s, %13$s, %14$s
</string>
<string-array name="rick_roll_domains" translatable="false">
<item>gab.com</item>
<item>gab.ai</item>
<item>spinster.xyz</item>
</string-array>
<string name="rick_roll_url">https://www.youtube.com/watch?v=dQw4w9WgXcQ</string>
<string-array name="poll_duration_names">
<item>@string/duration_5_min</item>

36
app/src/test/java/com/keylesspalace/tusky/util/RickRollTest.kt
View File

@ -1,36 +0,0 @@
package com.keylesspalace.tusky.util
import android.app.Activity
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.Robolectric
import org.robolectric.annotation.Config
@Config(sdk = [28])
@RunWith(AndroidJUnit4::class)
class RickRollTest {
private lateinit var activity: Activity
@Before
fun setupActivity() {
val controller = Robolectric.buildActivity(Activity::class.java)
activity = controller.get()
}
@Test
fun testShouldRickRoll() {
listOf("gab.Com", "social.gab.ai", "whatever.GAB.com").forEach {
rollableDomain ->
assertTrue(shouldRickRoll(activity, rollableDomain))
}
listOf("chaos.social", "notgab.com").forEach {
notRollableDomain ->
assertFalse(shouldRickRoll(activity, notRollableDomain))
}
}
}