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

[blocking] Revert "rick roll instead of logging in on selected domains" and more 

Blocking is not needed.

This reverts commit 5d04a7ccda, reversing
changes made to 1b86efaa10.
This commit is contained in:
kyori19 2019-06-22 15:04:58 +09:00
parent c564c8f55f
commit 789c90c916
4 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,6 @@ import com.keylesspalace.tusky.entity.AccessToken
import com.keylesspalace.tusky.entity.AppCredentials
import com.keylesspalace.tusky.network.MastodonApi
import com.keylesspalace.tusky.util.ThemeUtils
import com.keylesspalace.tusky.util.rickRoll
import com.keylesspalace.tusky.util.shouldRickRoll
import kotlinx.android.synthetic.main.activity_login.*
import okhttp3.HttpUrl
import retrofit2.Call
@ -140,11 +138,6 @@ class LoginActivity : BaseActivity(), Injectable {
return
}
if (shouldRickRoll(this, domain)) {
rickRoll(this)
return
}
val callback = object : Callback<AppCredentials> {
override fun onResponse(call: Call<AppCredentials>,
response: Response<AppCredentials>) {

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

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

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

@ -1,34 +0,0 @@
package com.keylesspalace.tusky.util
import android.app.Activity
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.keylesspalace.tusky.FakeTuskyApplication
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(application = FakeTuskyApplication::class)
@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))
}
}
}