Code clean
This commit is contained in:
@@ -87,9 +87,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
Action.IMPORT_QR_CODE_CONFIG ->
|
||||
scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
|
||||
|
||||
// Action.IMPORT_QR_CODE_URL ->
|
||||
// scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
|
||||
|
||||
Action.READ_CONTENT_FROM_URI ->
|
||||
chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
|
||||
type = "*/*"
|
||||
@@ -110,8 +107,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
enum class Action {
|
||||
NONE,
|
||||
IMPORT_QR_CODE_CONFIG,
|
||||
|
||||
//IMPORT_QR_CODE_URL,
|
||||
READ_CONTENT_FROM_URI,
|
||||
POST_NOTIFICATIONS
|
||||
}
|
||||
@@ -129,12 +124,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
}
|
||||
}
|
||||
|
||||
// private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
|
||||
// if (it.resultCode == RESULT_OK) {
|
||||
// importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
|
||||
// }
|
||||
// }
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(binding.root)
|
||||
@@ -325,7 +314,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
|
||||
override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
|
||||
R.id.import_qrcode -> {
|
||||
importQRcode(true)
|
||||
importQRcode()
|
||||
true
|
||||
}
|
||||
|
||||
@@ -379,26 +368,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
true
|
||||
}
|
||||
|
||||
// R.id.import_config_custom_clipboard -> {
|
||||
// importConfigCustomClipboard()
|
||||
// true
|
||||
// }
|
||||
//
|
||||
// R.id.import_config_custom_local -> {
|
||||
// importConfigCustomLocal()
|
||||
// true
|
||||
// }
|
||||
//
|
||||
// R.id.import_config_custom_url -> {
|
||||
// importConfigCustomUrlClipboard()
|
||||
// true
|
||||
// }
|
||||
//
|
||||
// R.id.import_config_custom_url_scan -> {
|
||||
// importQRcode(false)
|
||||
// true
|
||||
// }
|
||||
|
||||
R.id.export_all -> {
|
||||
exportAll()
|
||||
true
|
||||
@@ -462,16 +431,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
/**
|
||||
* import config from qrcode
|
||||
*/
|
||||
private fun importQRcode(forConfig: Boolean): Boolean {
|
||||
private fun importQRcode(): Boolean {
|
||||
val permission = Manifest.permission.CAMERA
|
||||
if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
|
||||
if (forConfig) {
|
||||
scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
|
||||
} else {
|
||||
//scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
|
||||
}
|
||||
scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
|
||||
} else {
|
||||
pendingAction = Action.IMPORT_QR_CODE_CONFIG//if (forConfig) Action.IMPORT_QR_CODE_CONFIG else Action.IMPORT_QR_CODE_URL
|
||||
pendingAction = Action.IMPORT_QR_CODE_CONFIG
|
||||
requestPermissionLauncher.launch(permission)
|
||||
}
|
||||
return true
|
||||
@@ -535,77 +500,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
}
|
||||
|
||||
|
||||
// private fun importConfigCustomClipboard()
|
||||
// : Boolean {
|
||||
// try {
|
||||
// val configText = Utils.getClipboard(this)
|
||||
// if (TextUtils.isEmpty(configText)) {
|
||||
// toast(R.string.toast_none_data_clipboard)
|
||||
// return false
|
||||
// }
|
||||
// importCustomizeConfig(configText)
|
||||
// return true
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// return false
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
* import config from local config file
|
||||
*/
|
||||
// private fun importConfigCustomLocal(): Boolean {
|
||||
// try {
|
||||
// showFileChooser()
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// return false
|
||||
// }
|
||||
// return true
|
||||
// }
|
||||
//
|
||||
// private fun importConfigCustomUrlClipboard()
|
||||
// : Boolean {
|
||||
// try {
|
||||
// val url = Utils.getClipboard(this)
|
||||
// if (TextUtils.isEmpty(url)) {
|
||||
// toast(R.string.toast_none_data_clipboard)
|
||||
// return false
|
||||
// }
|
||||
// return importConfigCustomUrl(url)
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// return false
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
* import config from url
|
||||
*/
|
||||
// private fun importConfigCustomUrl(url: String?): Boolean {
|
||||
// try {
|
||||
// if (!Utils.isValidUrl(url)) {
|
||||
// toast(R.string.toast_invalid_url)
|
||||
// return false
|
||||
// }
|
||||
// lifecycleScope.launch(Dispatchers.IO) {
|
||||
// val configText = try {
|
||||
// HttpUtil.getUrlContentWithUserAgent(url)
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// ""
|
||||
// }
|
||||
// launch(Dispatchers.Main) {
|
||||
// importCustomizeConfig(configText)
|
||||
// }
|
||||
// }
|
||||
// } catch (e: Exception) {
|
||||
// e.printStackTrace()
|
||||
// return false
|
||||
// }
|
||||
// return true
|
||||
// }
|
||||
|
||||
/**
|
||||
* import config from sub
|
||||
*/
|
||||
@@ -755,29 +649,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
|
||||
}
|
||||
}
|
||||
|
||||
// /**
|
||||
// * import customize config
|
||||
// */
|
||||
// private fun importCustomizeConfig(server: String?) {
|
||||
// try {
|
||||
// if (server == null || TextUtils.isEmpty(server)) {
|
||||
// toast(R.string.toast_none_data)
|
||||
// return
|
||||
// }
|
||||
// if (mainViewModel.appendCustomConfigServer(server)) {
|
||||
// mainViewModel.reloadServerList()
|
||||
// toastSuccess(R.string.toast_success)
|
||||
// } else {
|
||||
// toastError(R.string.toast_failure)
|
||||
// }
|
||||
// //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
|
||||
// } catch (e: Exception) {
|
||||
// ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
|
||||
// e.printStackTrace()
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
|
||||
private fun setTestState(content: String?) {
|
||||
binding.tvTestState.text = content
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user