From 8833649c3468fce9cc40a0e94371049093c5dd7d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 5 Dec 2013 01:45:51 +0100 Subject: Show location in openvpn notification message (Feature #4665) --- res/values-cs/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-id/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values/strings.xml | 2 +- src/se/leap/openvpn/OpenVpnService.java | 5 ++++- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 37ae7f40..fc367db0 100755 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -235,7 +235,7 @@ OpenVPN neočekávaně havarovalo. Zvaž možnost použití volby poslat Minidump z hlavního menu Poslat Minidump vývojáři Poslat ladící informace o poslední havárii vývojáři - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s Připojuji se diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index df50b594..c99314f4 100755 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -235,7 +235,7 @@ Der OpenVPN Prozess ist unerwartet abgestürzt. Bitte erwägen Sie die Option \"Minidump senden\" im Hauptmenü Minidump an Entwickler senden Sendet Debugging Informationen des letzten Absturzes an den Entwickler - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s Verbinde diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index 0166b7ea..2851a17b 100755 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -235,7 +235,7 @@ OpenVPN crash tak terduga. Silakan mempertimbangkan mengirim menggunakan pilihan Minidump di Menu Utama Mengirim MiniDump untuk pengembang Kirim informasi kesalahan tentang kegagalan aplikasi yang terakhir ke pengembang - OpenVPN - %s + Bitmask - %s %1$ s - %2$ s %1$ s - %3$ s, %2$ s Menghubungkan diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index db7602f7..b7885861 100755 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -274,7 +274,7 @@ TCP keepaliveと長いタイムアウト時間は動作しますが、TCP over T OpenVPN は予期せず終了しました。メイン メニューでミニダンプの送信オプションを検討してください。 ミニダンプを開発者に送信 最後にクラッシュした時のデバッグ情報を作者に送信します。 - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s 接続中 diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1d3c10a3..0bd87cd0 100755 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -234,7 +234,7 @@ OpenVPN завершилась неожиданно. Пожалуйста, посмотрите опцию \"Отправить Minidump\" в главном меню Отправить Minidump разработчику Отправка отладочной информации разработчику о последнем неудачном завершении - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s Подключение diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 14d9ce90..f055e913 100755 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -235,7 +235,7 @@ OpenVPN впав несподівано. Будь ласка, розгляньте використання параметру \"Надіслати Мінідамп\" в головному меню Надіслати мінідамп розробнику Надіслати налагоджувальну інформацію про останній збій розробнику - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s Підключення diff --git a/res/values/strings.xml b/res/values/strings.xml index 2598d452..28d159b0 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -239,7 +239,7 @@ OpenVPN crashed unexpectedly. Please consider using the send Minidump option in the main menu Send Minidump to developer Send debugging information about last crash to developer - OpenVPN - %s + Bitmask - %s %1$s - %2$s %1$s - %3$s, %2$s Connecting diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index 69dd56f4..f5b932f2 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -114,7 +114,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac android.app.Notification.Builder nbuilder = new Notification.Builder(this); - nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mName)); + nbuilder.setContentTitle(getString(R.string.notifcation_title,mProfile.mLocation)); nbuilder.setContentText(msg); nbuilder.setOnlyAlertOnce(true); nbuilder.setOngoing(persistant); @@ -481,6 +481,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac boolean persist = false; if (("NOPROCESS".equals(state) ) || ("EXITING").equals(state)){ showNotification(state, getString(R.string.eip_state_not_connected), ticker, false, 0, persist); + } + else if (state.equals("GET_CONFIG")){ + } else{ persist = true; -- cgit v1.2.3 From ff4d4fde206a405064e48f49edcc7ce46ca68fab Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 5 Dec 2013 02:22:44 +0100 Subject: Turn the login icon into simple text (Bug #4659) --- res/menu/client_dashboard.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml index 2ce8b87c..8f4a7ba8 100644 --- a/res/menu/client_dashboard.xml +++ b/res/menu/client_dashboard.xml @@ -17,11 +17,10 @@ + android:title="@string/switch_provider_menu_option"/> -- cgit v1.2.3 From 72f1d170adbaa08ca846a0e4ec77556c9a7ffc7d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 16 Dec 2013 20:02:54 +0100 Subject: remove 'Assigning IP address' from the progress notification (#4661) --- src/se/leap/bitmaskclient/EipServiceFragment.java | 5 ++++- src/se/leap/openvpn/OpenVpnService.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/se/leap/bitmaskclient/EipServiceFragment.java b/src/se/leap/bitmaskclient/EipServiceFragment.java index e182b3fd..b409394b 100644 --- a/src/se/leap/bitmaskclient/EipServiceFragment.java +++ b/src/se/leap/bitmaskclient/EipServiceFragment.java @@ -202,7 +202,10 @@ public class EipServiceFragment extends Fragment implements StateListener, OnCli switchState = false; } else if (state.equals("NOPROCESS")){ statusMessage = logmessage; - } else { + } else if (state.equals("ASSIGN_IP")){ //don't show assigning message in eipStatus + statusMessage = (String) eipStatus.getText(); + } + else { statusMessage = prefix + " " + logmessage; } diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index f5b932f2..b5c9c798 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -482,8 +482,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac if (("NOPROCESS".equals(state) ) || ("EXITING").equals(state)){ showNotification(state, getString(R.string.eip_state_not_connected), ticker, false, 0, persist); } - else if (state.equals("GET_CONFIG")){ - + else if (state.equals("GET_CONFIG") || state.equals("ASSIGN_IP")){ //don't show them in the notification message } else{ persist = true; -- cgit v1.2.3 From 4d9b896481594297421a157a5906b5a8ead48ab6 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 16 Dec 2013 23:11:41 +0100 Subject: Correct the location name in the notification (Bug #4660) --- src/se/leap/bitmaskclient/EIP.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java index ec2f6972..edd73e83 100644 --- a/src/se/leap/bitmaskclient/EIP.java +++ b/src/se/leap/bitmaskclient/EIP.java @@ -439,7 +439,8 @@ public final class EIP extends IntentService { String ports = "ports"; String protos = "protocols"; String capabilities = "capabilities"; - String location = "location"; + String location_key = "location"; + String locations = "locations"; Vector arg = new Vector(); Vector> args = new Vector>(); @@ -456,7 +457,6 @@ public final class EIP extends IntentService { arg.add(word); value.add( (Vector) arg.clone() ); options.put(key, (Vector>) value.clone()); - value.clear(); arg.clear(); } @@ -477,16 +477,22 @@ public final class EIP extends IntentService { arg.clear(); args.clear(); + try { - arg.add(location); - arg.add(mGateway.getString(location)); + + arg.add(location_key); + String locationText = ""; + locationText = eipDefinition.getJSONObject(locations).getJSONObject(mGateway.getString(location_key)).getString("name"); + arg.add(locationText); + } catch (JSONException e) { // TODO Auto-generated catch block e.printStackTrace(); } args.add((Vector) arg.clone()); options.put("location", (Vector>) args.clone() ); + arg.clear(); args.clear(); JSONArray protocolsJSON = null; -- cgit v1.2.3