diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java index 67067d3c..8d77e9c3 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java +++ b/app/src/main/java/com/emanuelef/remote_capture/MitmAddon.java @@ -48,8 +48,8 @@ import java.io.IOException; import java.lang.ref.WeakReference; public class MitmAddon { - public static final long PACKAGE_VERSION_CODE = 15; - public static final String PACKAGE_VERSION_NAME = "v0.15"; + public static final long PACKAGE_VERSION_CODE = 16; + public static final String PACKAGE_VERSION_NAME = "v0.16"; public static final String REPOSITORY = "https://github.com/emanuele-f/PCAPdroid-mitm"; private static final String TAG = "MitmAddon"; private final Context mContext; @@ -125,13 +125,6 @@ public class MitmAddon { PACKAGE_VERSION_NAME + "/PCAPdroid-mitm_" + PACKAGE_VERSION_NAME + "_" + Build.SUPPORTED_ABIS[0] + ".apk"; } - public static boolean hasMitmPermission(Context ctx) { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - return ctx.checkSelfPermission(MitmAPI.MITM_PERMISSION) == PackageManager.PERMISSION_GRANTED; - - return true; - } - public static void setCAInstallationSkipped(Context ctx, boolean skipped) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); prefs.edit() @@ -158,7 +151,7 @@ public class MitmAddon { return true; // Perform some other quick checks just in case the env has changed - if(!isInstalled(ctx) || !hasMitmPermission(ctx)) { + if(!isInstalled(ctx)) { setDecryptionSetupDone(ctx, false); return true; } diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/GrantPermission.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/GrantPermission.java deleted file mode 100644 index af066550..00000000 --- a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/GrantPermission.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This file is part of PCAPdroid. - * - * PCAPdroid is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with PCAPdroid. If not, see . - * - * Copyright 2022 - Emanuele Faranda - */ - -package com.emanuelef.remote_capture.fragments.mitmwizard; - -import android.content.ActivityNotFoundException; -import android.os.Bundle; -import android.view.View; - -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.emanuelef.remote_capture.R; -import com.emanuelef.remote_capture.Utils; -import com.emanuelef.remote_capture.MitmAddon; -import com.pcapdroid.mitm.MitmAPI; - -public class GrantPermission extends StepFragment { - private final ActivityResultLauncher requestPermissionLauncher = - registerForActivityResult(new ActivityResultContracts.RequestPermission(), this::onPermissionGrant); - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - mStepLabel.setText(R.string.grant_mitm_permission); - - if(!MitmAddon.hasMitmPermission(requireContext())) - requestPermission(); - else - permOk(); - } - - private void permOk() { - nextStep(R.id.navto_install_cert); - } - - private void onPermissionGrant(boolean isGranted) { - if(isGranted) - permOk(); - } - - private void requestPermission() { - mStepButton.setText(R.string.configure_action); - mStepButton.setOnClickListener(v -> { - try { - requestPermissionLauncher.launch(MitmAPI.MITM_PERMISSION); - } catch (ActivityNotFoundException e) { - Utils.showToastLong(requireContext(), R.string.no_intent_handler_found); - } - }); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java index 80fa48a9..8183a6d2 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java +++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/mitmwizard/InstallAddon.java @@ -52,7 +52,7 @@ public class InstallAddon extends StepFragment { } private void addonOk() { - nextStep(R.id.navto_grant_permission); + nextStep(R.id.navto_install_cert); } private void installAddon() { diff --git a/app/src/main/java/com/pcapdroid/mitm/MitmAPI.java b/app/src/main/java/com/pcapdroid/mitm/MitmAPI.java index c1546b7a..d88fa128 100644 --- a/app/src/main/java/com/pcapdroid/mitm/MitmAPI.java +++ b/app/src/main/java/com/pcapdroid/mitm/MitmAPI.java @@ -24,7 +24,6 @@ import java.io.Serializable; /* API to integrate MitmAddon */ public class MitmAPI { public static final String PACKAGE_NAME = "com.pcapdroid.mitm"; - public static final String MITM_PERMISSION = "com.pcapdroid.permission.MITM"; public static final String MITM_SERVICE = PACKAGE_NAME + ".MitmService"; public static final int MSG_ERROR = -1; diff --git a/app/src/main/res/navigation/mitm_wizard_graph.xml b/app/src/main/res/navigation/mitm_wizard_graph.xml index a6bc63b3..6fc62106 100644 --- a/app/src/main/res/navigation/mitm_wizard_graph.xml +++ b/app/src/main/res/navigation/mitm_wizard_graph.xml @@ -22,19 +22,6 @@ android:id="@+id/installMitmApp" android:name="com.emanuelef.remote_capture.fragments.mitmwizard.InstallAddon" tools:layout="@layout/fragment_mitm_wizard" > - - - - ثَبَّتَ تصدير تَهيئة - امنح PCAPdroid الإذن للتحكم في إضافة mitm الترتيب حسب أسم المستخدم فشلت الكتابة إلى وحدة التخزين الخارجية. تحقق من سجل التطبيق للحصول على التفاصيل @@ -487,4 +486,4 @@ نص غير مشفر RX بدء لالتقاط فشل . تأكد من منح حق الوصول إلى الجذر (root) لPCAPdroid - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0cfa7c37..50aec98a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -256,7 +256,6 @@ Protokoll Keine Daten Whitelist (Malware)… - Geben Sie PCAPdroid die Berechtigung, das mitm-Addon zu steuern Beim Exportieren des CA-Zertifikats ist ein Fehler aufgetreten \n \nWenn Ihr Gerät Autostart oder ähnliche Software implementiert, um die Ausführung von Hintergrunddiensten einzuschränken, stellen Sie sicher, dass Sie PCAPdroid auf die weiße Liste setzen @@ -466,4 +465,4 @@ Mitm addon läuft Diese Regeln geben an, welche Verbindungen zu entschlüsseln sind. Host-basierte Regeln funktionieren nur, wenn eine vorherige DNS-Antwort angezeigt wird Aktivier mit QR-Code - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index df03254b..3aca39f5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -228,7 +228,6 @@ Instalar Exportar Configurar - Otorgar a PCAPdroid el permiso de controlar el complemento mitm Verificando el certificado… Certificado exportado, ahora instálalo en los ajustes de Android Un error ha ocurrido mientras se exportaba el certificado CA @@ -487,4 +486,4 @@ Se ha detectado una VPN activa Carga del fichero PCAP en curso, por favor espera Fallo al realizar la captura. Asegúrate de conceder acceso root a PCAPdroid - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 56c23169..c31da88a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -268,7 +268,6 @@ Instal Ekspor Konfigurasikan - Berikan PCAPdroid izin untuk mengontrol mitm addon Ekspor sertifikat CA PCAPdroid, lalu buka pengaturan \"Enkripsi & Kredensial\" Android dan pilih instal sebagai \"sertifikat CA\" Ekspor gagal Tidak dienkripsi @@ -395,4 +394,4 @@ Fitur berbayar tidak terkunci. Mulai ulang penangkapan jika berjalan Info build Fitur berbayar - \ 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 354f485a..78780fe6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -285,7 +285,6 @@ Esporta Configura Esporta il certificato CA di PCAPdroid, poi importalo dalle impostazioni Android di \"Crittografia e Credenziali\", installandolo come \"Certificato CA\" - Dai a PCAPdroid il permesso di controllare l\'addon di mitm Errore durante l\'esportazione del certificato CA \n \nSe il tuo dispositivo utilizza Autostart o software simile per limitare l\'esecuzione di processi in background, assicurati di escludere PCAPdroid @@ -486,4 +485,4 @@ La connessione non sarà decrittata. Per decrittarla, crea una regola di decrittazione La decrittazione TLS è applicata soltanto alle connessioni che matchano le regole configurate. Vuoi creare ora delle regole di decrittazione\? Avvio della cattura fallito. Assicurati di concedere l\'accesso root a PCAPdroid - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 0274e24f..dde9c992 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -299,7 +299,6 @@ Eksporter TLS-dekryptering Dekrypter SSL/TLS-trafikk ved å utføre MITM. Dette kan fungere med noen programmer nå. Sjekk brukerveiledningen. - Gi PCAPdroid tilgang til å kontrollere MITM-tillegget Eksporter sertifikatmyndighetssertifikatet tilhørende PCAPdroid, åpne så «Kryptering og identitetsdetaljer» i Android og veld å installere det som et «CA-sertifikat». Sjekker sertifikatet … Sertifikat eksporter. Installer det nå fra Android-innstillingene. @@ -354,4 +353,4 @@ \n \nVia trailer-alternativet, kan du legge til programnavn i pakkene og vise dem i Wireshark. MITM-tillegget for PCAPdroid må oppgraderes. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f60ce808..cb8cdd5d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -273,7 +273,6 @@ Eksport Zainstaluj PCAPdroid dodatek mitm Skonfiguruj - Zezwól PCAPdroidowi na kontrolowanie dodatku mitm Wyeksportuj certyfikat PCAPdroid CA, a następnie otwórz ustawienia Androida \"Szyfrowanie i poświadczenia\" i wybierz zainstaluj go jako \"Certyfikat CA\"" Zainstaluj certyfikat PCAPdroid CA, wybierając \"VPN i aplikacje\". Android poprosi o ekran blokady lub hasło Sprawdzanie certyfikatu… @@ -468,4 +467,4 @@ Aktywacja licencji zakończona Dodatek Mitm jest uruchomiony Dodatek Mitm jest uruchamiany… - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 62da0be7..9637094d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -228,7 +228,6 @@ Uso do heap Somente IPv6 Firewall: %1$s - Conceda ao PCAPdroid uma permissão para controlar a extensão de mitm A extensão de mitm do PCAPdroid precisa ser atualizada PCAPdroid fornece múltiplas formas para fazer o dump do tráfego no formato PCAP padrão para análise posterior \n @@ -403,4 +402,4 @@ Solicitando um token de desbloqueio, aguarde Mostrar Este é seu token de desbloqueio. Anote-o, porque será preciso para gerar seus códigos de licença - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 01aa6739..59aae22c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -223,7 +223,6 @@ Мастер настройки mitm Установить Экспорт - Дать PCAPdroid разрешение контролировать mitm дополнение Настроить Сертификат экспортирован, теперь установите его из настроек Android Корневой сертификат не установлен, запустите мастер настройки mitm @@ -465,4 +464,4 @@ Не расшифровывать… Зашифровано Инжектировано - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d2054780..742fcaf1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -263,7 +263,6 @@ Ortadaki adam gerçekleştirerek SSL/TLS trafiğinin şifresini çöz. Bu artık bazı uygulamalarla çalışabilir, kullanım kılavuzuna bakın Trafik denetimi Dışa aktar - PCAPdroid\'e ortadaki adam eklentisini denetleme izni verin Ortadaki adam hizmeti başlatılamadı. Ortadaki adam eklentisini elle açmaya çalışın ve yeniden deneyin Şifrelenmedi CA sertifikası kurulmadı, ortadaki adam kurulum sihirbazını çalıştırın @@ -466,4 +465,4 @@ Bu kurallar hangi bağlantıların şifresinin çözüleceğini belirtir. Ana makine tabanlı kurallar yalnızca önceden bir DNS yanıtı görülürse çalışır Şifresini çöz… Şifreli - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index eb4b49bb..bc574fd5 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -405,7 +405,6 @@ Встановити Експортувати Встановити доповнення mitm PCAPdroid - Надати дозвіл PCAPdroid для керування доповненням mitm Експортуйте сертифікат PCAPdroid CA. потім відкрийте налаштування Android \"Шифрування й облікові дані\" та виберіть встановити його як \"Сертифікат ЦС\" Встановіть сертифікат PCAPdroid CA, обираючи \"VPN та додатки\". Android запитає ваше блокування екрану або пароль Трапилася помилка при експортуванні сертифікату ЦС @@ -486,4 +485,4 @@ Встановлено Керування дозволами Домен чорного списку - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fa502997..ac5270c3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -250,7 +250,6 @@ Mitm 设置向导 安装 配置 - 给予 PCAPdroid 控制 mitm 附加组件的权限 检查证书… 证书已导出,从 Android 系统设置安装它 CA 证书已安装 @@ -512,4 +511,4 @@ 此连接不会被解密。创建解密规则来解密它 检测到活动 VPN 流量捕获启动失败。请确保你授予了 PCAPdroid 根权限 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd8d260d..f44df8e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -276,7 +276,6 @@ Export Install the PCAPdroid mitm addon Configure - Give PCAPdroid the permission to control the mitm addon Export the PCAPdroid CA certificate, then open the Android \"Encryption & Credentials\" settings and choose install it as a \"CA certificate\" Install the PCAPdroid CA certificate, choosing \"VPN and apps\". Android will ask for your lockscreen or password Checking the certificate…