From 74056dd36e2e96cc4851ec7ebcf6d6c28aa3fb0f Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Fri, 5 Nov 2021 22:22:16 +0100 Subject: [PATCH] Add licenses links in about --- .../activities/AboutActivity.java | 8 +- app/src/main/res/layout/about_activity.xml | 76 +++++++++---------- app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values/strings.xml | 15 +++- 8 files changed, 53 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/AboutActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/AboutActivity.java index d7d71f02..e17a600c 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/activities/AboutActivity.java +++ b/app/src/main/java/com/emanuelef/remote_capture/activities/AboutActivity.java @@ -40,13 +40,11 @@ public class AboutActivity extends BaseActivity { TextView appVersion = findViewById(R.id.app_version); appVersion.setText(getString(R.string.pcapdroid_app_name) + " " + Utils.getAppVersion(this)); - TextView gplLicense = findViewById(R.id.app_license_link); - String localized = gplLicense.getText().toString(); - gplLicense.setText(HtmlCompat.fromHtml("" + localized + "", HtmlCompat.FROM_HTML_MODE_LEGACY)); - gplLicense.setMovementMethod(LinkMovementMethod.getInstance()); + ((TextView)findViewById(R.id.app_license)).setMovementMethod(LinkMovementMethod.getInstance()); + ((TextView)findViewById(R.id.opensource_licenses)).setMovementMethod(LinkMovementMethod.getInstance()); TextView sourceLink = findViewById(R.id.app_source_link); - localized = sourceLink.getText().toString(); + String localized = sourceLink.getText().toString(); sourceLink.setText(HtmlCompat.fromHtml("" + localized + "", HtmlCompat.FROM_HTML_MODE_LEGACY)); sourceLink.setMovementMethod(LinkMovementMethod.getInstance()); } diff --git a/app/src/main/res/layout/about_activity.xml b/app/src/main/res/layout/about_activity.xml index 3bb7ec55..3470cb3c 100644 --- a/app/src/main/res/layout/about_activity.xml +++ b/app/src/main/res/layout/about_activity.xml @@ -32,50 +32,48 @@ android:textStyle="bold" tools:text="PCAPdroid vx.y.z"/> - + android:layout_alignParentStart="true"> - + - + - + - + + + + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index cdd0138b..911fb7b6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -82,8 +82,6 @@ File salvato correttamente %1$d connessioni precedenti nascoste PCAPdroid è un software libero per la cattura e il monitoraggio di rete che funziona senza privilegi di root. - PCAPdroid è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UNO SCOPO PARTICOLARE. Fare riferimento alla GNU General Public License per ulteriori dettagli. - Licenza GPLv3 Scaricala: Come impostare la Decrittazione TLS Sconosciuta diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6df985bd..670b5c64 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -83,8 +83,6 @@ ファイルは正常に保存されました %1$d より古い接続は表示されません PCAPdroid はルート権限なしで動作するオープン ソースのネットワーク キャプチャ、モニタリング ツールです。 - PCAPdroid は役に立つことを願って配布していますが、暗黙の保証も含め一切の保証はありません。詳細は GNU General Public License をご覧ください。 - GPLv3 ライセンス 入手: TLS 復号化のセットアップ方法 不明 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 943c267f..fc121771 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -84,8 +84,6 @@ Arquivo salvo com sucesso %1$d conexões mais antigas não mostradas PCAPdroid é uma ferramenta de captura e monitoramento de rede de software livre que funciona sem acesso Root. - PCAPdroid é distribuído na esperança de ser útil, mas SEM QUALQUER TIPO DE GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM PROPÓSITO PARTICULAR. Veja a Licença Pública Geral GNU para mais detalhes. - Licença GPLv3 Obtenha-o: Como configurar a decriptação de TLS Desconhecido diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 89e9e12d..0480aae4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -82,8 +82,6 @@ Файл успешно сохранён %1$d старых соединений не показано PCAPdroid это свободный инструмент захвата и отслеживания сетевого трафика, который работает без привелегий суперпользователя. - PCAPdroid распространяется в надежде на то, что он будет полезен, но БЕЗ КАКОЙ-ЛИБО ГАРАНТИИ; даже без предполагаемой ТОВАРНОЙ гарантии или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите Генеральную Общественную Лицензию для более детальной информации. - Генеральная общественная лицензия версии 3 Получить его: Как настроить TLS дешифрование Неизвестное diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2bfe1afa..086f78d4 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -92,8 +92,6 @@ 文件保存成功 未显示 %1$d 个较旧连接 PCAPdroid 是一款无需获取根权限便可进行网络捕获和监视的开源工具 - 分发 PCAPdroid 是希望它会有用，但开发者不提供任何保证；甚至没有对适销性或适合某一特定目的的默示保证。更多细节请参阅 GNU 通用公共许可证。 - GPLv3 许可 获取应用: 如何设置 TLS 解密 未知 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e867af33..f08cddc2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,6 +7,19 @@ SNI URL WHOIS + PCAPdroid is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for + more details. + Open Source Licenses:
\n\n + - zdtun: GPL-3.0\n\n + - nDPI: LGPL-3.0\n\n + - nanohttpd: BSD-3-Clause\n\n + - CustomActivityOnCrash: Apache-2.0\n\n + - gson: Apache-2.0\n\n + - Font Awesome: License\n\n + - App icon made by Freepik from flaticon\n\n + Start @@ -92,8 +105,6 @@ File successfully saved %1$d older connections not shown PCAPdroid is an open source network capture and monitoring tool which works without root privileges. - PCAPdroid is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - GPLv3 License Get it: How to setup the TLS decryption Unknown