Skip to content

Commit

Permalink
revert "allow to use wadb without prop check"
Browse files Browse the repository at this point in the history
Changes were added because of a wrong report
  • Loading branch information
RikkaW committed Oct 24, 2020
1 parent 48d2fc3 commit 8e81422
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package moe.shizuku.manager.home

import android.app.Dialog
import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager
import moe.shizuku.manager.R
import moe.shizuku.manager.starter.StarterActivity
import java.net.InetAddress

class WadbNotEnabledDialogFragment :DialogFragment() {

Expand All @@ -17,15 +14,6 @@ class WadbNotEnabledDialogFragment :DialogFragment() {
return AlertDialog.Builder(context)
.setMessage(R.string.dialog_wireless_adb_not_enabled)
.setPositiveButton(android.R.string.ok, null)
.setNeutralButton(context.getString(R.string.dialog_adb_try, 5555)) { _, _ ->
val host = InetAddress.getLoopbackAddress().hostName
val intent = Intent(context, StarterActivity::class.java).apply {
putExtra(StarterActivity.EXTRA_IS_ROOT, false)
putExtra(StarterActivity.EXTRA_HOST, host)
putExtra(StarterActivity.EXTRA_PORT, 5555)
}
context.startActivity(intent)
}
.create()
}

Expand Down
1 change: 0 additions & 1 deletion manager/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,4 @@
<string name="home_root_description_magisk">如果您还是无法让您的系统允许 Shizuku 开机启动,您可以尝试使用 %s。</string>
<string name="settings_start_on_boot_summary">对于已 root 设备,Shizuku 可以开机启动</string>
<string name="settings_start_on_boot">开机启动(root)</string>
<string name="dialog_adb_try">强制尝试 %d</string>
</resources>
1 change: 0 additions & 1 deletion manager/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,4 @@
<string name="home_root_description_magisk">如果您還是無法讓您的系統允許 Shizuku 開機啟動,您可以嘗試使用 %s。</string>
<string name="settings_start_on_boot_summary">對於已 root 裝置,Shizuku 可以開機啟動</string>
<string name="settings_start_on_boot">開機啟動(root)</string>
<string name="dialog_adb_try">強制嘗試 %d</string>
</resources>
1 change: 0 additions & 1 deletion manager/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<string name="adb_error_key_store">Unable to generate key for wireless debugging.\nThis may be because KeyStore mechanism of this device is broken.</string>
<string name="adb_pair_required">Please go through the pairing step first.</string>
<string name="development_settings">Developer options</string>
<string name="dialog_adb_try">Forced to try %d</string>

<!-- Home - Root -->
<string name="home_root_title"><![CDATA[Start (for rooted devices)]]></string>
Expand Down

0 comments on commit 8e81422

Please sign in to comment.