AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* correct behavior of back button on Android

Browse source 
* removing of annoying debug logs on Android
This commit is contained in:
Dmitriy Karpushin 2023-03-14 16:49:06 +03:00
parent fe7c66cf1d
commit 20846c8eff
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/android/src/org/amnezia/vpn/VPNServiceBinder.kt
View file

@ -196,7 +196,6 @@ class VPNServiceBinder(service: VPNService) : Binder() {
try { try {
mListener?.let { mListener?.let {
if (it.isBinderAlive) { if (it.isBinderAlive) {
Log.i(tag, "Dispatching event: binder alive")
val data = Parcel.obtain() val data = Parcel.obtain()
data.writeByteArray(payload?.toByteArray(charset("UTF-8"))) data.writeByteArray(payload?.toByteArray(charset("UTF-8")))
it.transact(code, data, Parcel.obtain(), 0) it.transact(code, data, Parcel.obtain(), 0)

10
client/android/src/org/amnezia/vpn/qt/VPNActivity.kt
View file

@ -99,8 +99,6 @@ class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
if (!isBound) { if (!isBound) {
Log.d(TAG, "dispatchParcel: not bound") Log.d(TAG, "dispatchParcel: not bound")
return return
} else {
Log.d(TAG, "dispatchParcel: bound")
} }
val out: Parcel = Parcel.obtain() val out: Parcel = Parcel.obtain()
@ -331,12 +329,4 @@ class VPNActivity : org.qtproject.qt.android.bindings.QtActivity() {
onActivityMessage(UI_EVENT_QR_CODE_RECEIVED, extra) onActivityMessage(UI_EVENT_QR_CODE_RECEIVED, extra)
} }
} }
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
onBackPressed()
return true
}
return super.onKeyDown(keyCode, event)
}
} }

4
client/ui/qml/main.qml
View file

@ -61,8 +61,12 @@ Window {
function close_page() { function close_page() {
if (pageLoader.depth <= 1) { if (pageLoader.depth <= 1) {
if (GC.isMobile()) {
root.close()
}
return return
} }
pageLoader.currentItem.deactivated() pageLoader.currentItem.deactivated()
pageLoader.pop() pageLoader.pop()
} }

15
client/ui/uilogic.cpp
View file

@ -224,9 +224,10 @@ void UiLogic::keyPressEvent(Qt::Key key)
m_configurator->sshConfigurator->openSshTerminal(m_settings->serverCredentials(m_settings->defaultServerIndex())); m_configurator->sshConfigurator->openSshTerminal(m_settings->serverCredentials(m_settings->defaultServerIndex()));
break; break;
case Qt::Key_Escape: case Qt::Key_Escape:
case Qt::Key_Back:
if (currentPage() == Page::Vpn) break; if (currentPage() == Page::Vpn) break;
if (currentPage() == Page::ServerConfiguringProgress) break; if (currentPage() == Page::ServerConfiguringProgress) break;
case Qt::Key_Back:
// if (currentPage() == Page::Start && pagesStack.size() < 2) break; // if (currentPage() == Page::Start && pagesStack.size() < 2) break;
// if (currentPage() == Page::Sites && // if (currentPage() == Page::Sites &&
// ui->tableView_sites->selectionModel()->selection().indexes().size() > 0) { // ui->tableView_sites->selectionModel()->selection().indexes().size() > 0) {
@ -243,10 +244,16 @@ void UiLogic::keyPressEvent(Qt::Key key)
void UiLogic::onCloseWindow() void UiLogic::onCloseWindow()
{ {
if (m_settings->serversCount() == 0) qApp->quit(); #ifdef Q_OS_ANDROID
else { qApp->quit();
hide(); #else
if (m_settings->serversCount() == 0)
{
qApp->quit();
} else {
emit hide();
} }
#endif
} }
QString UiLogic::containerName(int container) QString UiLogic::containerName(int container)