July 2019 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'sisbell-issue_199'
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit f83a98f4a79bf8ca82e0ae29c0393a50f875c8f9 Merge: 7c2cfc3e ff7d3dd5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 29 17:04:58 2019 -0400 Merge branch 'sisbell-issue_199' app/src/main/res/drawable-hdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-hdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../drawable-hdpi/ic_filter_none_black_36dp.png | Bin 232 -> 0 bytes .../ic_playlist_add_check_black_36dp.png | Bin 221 -> 0 bytes app/src/main/res/drawable-hdpi/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-mdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-mdpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-xhdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-xhdpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable/button.xml | 37 --- app/src/main/res/drawable/button_off.xml | 37 --- app/src/main/res/drawable/button_on.xml | 35 --- app/src/main/res/drawable/error.png | Bin 2922 -> 0 bytes app/src/main/res/drawable/ic_menu_goto.png | Bin 1636 -> 0 bytes app/src/main/res/drawable/ic_play.png | Bin 3560 -> 0 bytes app/src/main/res/drawable/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable/n8fr8.jpg | Bin 18062 -> 0 bytes app/src/main/res/drawable/rounded_button.xml | 13 - app/src/main/res/drawable/toggle.xml | 8 - app/src/main/res/drawable/tor.png | Bin 4766 -> 0 bytes app/src/main/res/drawable/tor25.png | Bin 2227 -> 0 bytes app/src/main/res/layout/layout_about.xml | 4 +- .../res/layout/layout_add_client_cookie_dialog.xml | 2 - .../res/layout/layout_content_client_cookies.xml | 1 - app/src/main/res/layout/layout_help.xml | 20 -- .../res/layout/layout_hs_backups_list_item.xml | 1 - app/src/main/res/layout/layout_hs_data_dialog.xml | 3 - .../main/res/layout/layout_hs_list_view_main.xml | 1 - app/src/main/res/layout/layout_log.xml | 52 ---- app/src/main/res/layout/layout_main.xml | 12 +- app/src/main/res/layout/layout_orbot_control.xml | 10 - app/src/main/res/layout/layout_vpn_setup.xml | 34 --- .../main/res/layout/scrollingtext_buttons_view.xml | 34 --- app/src/main/res/menu/orbot_main.xml | 4 +- app/src/main/res/menu/share_menu.xml | 7 - app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 - app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2253 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 2146 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4325 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1580 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1376 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2723 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 3071 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 3075 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6103 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4682 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 5112 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 9447 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 6541 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 7372 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 13447 -> 0 bytes app/src/main/res/values-ach/strings.xml | 1 - app/src/main/res/values-ar/poestrings.xml | 18 -- app/src/main/res/values-ar/strings.xml | 152 ---------- app/src/main/res/values-ay/poestrings.xml | 24 -- app/src/main/res/values-ay/strings.xml | 150 --------- app/src/main/res/values-az/strings.xml | 201 ++----------- app/src/main/res/values-be/poestrings.xml | 21 -- app/src/main/res/values-be/strings.xml | 150 --------- app/src/main/res/values-bg/poestrings.xml | 22 -- app/src/main/res/values-bg/strings.xml | 199 ++---------- app/src/main/res/values-bn-rBD/strings.xml | 54 +--- app/src/main/res/values-bn-rIN/strings.xml | 10 +- app/src/main/res/values-bn/strings.xml | 26 +- app/src/main/res/values-brx/strings.xml | 7 +- app/src/main/res/values-bs/strings.xml | 14 +- app/src/main/res/values-ca/poestrings.xml | 22 -- app/src/main/res/values-ca/strings.xml | 218 +++----------- app/src/main/res/values-cs-rCZ/strings.xml | 197 ++---------- app/src/main/res/values-cs/strings.xml | 75 +---- app/src/main/res/values-cy/strings.xml | 69 +---- app/src/main/res/values-da/strings.xml | 156 ++-------- app/src/main/res/values-de-rAT/strings.xml | 1 - app/src/main/res/values-de/poestrings.xml | 21 -- app/src/main/res/values-de/strings.xml | 218 +++----------- app/src/main/res/values-el/poestrings.xml | 22 -- app/src/main/res/values-el/strings.xml | 218 +++----------- app/src/main/res/values-en-rGB/poestrings.xml | 22 -- app/src/main/res/values-en-rGB/strings.xml | 67 +---- app/src/main/res/values-eo/strings.xml | 109 ++----- app/src/main/res/values-es-rAR/poestrings.xml | 21 -- app/src/main/res/values-es-rAR/strings.xml | 167 ++--------- app/src/main/res/values-es/arrays.xml | 8 +- app/src/main/res/values-es/poestrings.xml | 22 -- app/src/main/res/values-es/strings.xml | 218 +++----------- app/src/main/res/values-et/strings.xml | 155 ++-------- app/src/main/res/values-eu/poestrings.xml | 21 -- app/src/main/res/values-eu/strings.xml | 218 +++----------- app/src/main/res/values-fa/poestrings.xml | 22 -- app/src/main/res/values-fa/strings.xml | 219 +++----------- app/src/main/res/values-fi/strings.xml | 143 --------- app/src/main/res/values-fr-rFR/strings.xml | 199 ++---------- app/src/main/res/values-fr/poestrings.xml | 21 -- app/src/main/res/values-fr/strings.xml | 218 +++----------- app/src/main/res/values-gl/poestrings.xml | 22 -- app/src/main/res/values-gl/strings.xml | 219 +++----------- app/src/main/res/values-gu-rIN/strings.xml | 4 +- app/src/main/res/values-gu/strings.xml | 15 +- app/src/main/res/values-he/strings.xml | 228 +++----------- app/src/main/res/values-hi/poestrings.xml | 21 -- app/src/main/res/values-hi/strings.xml | 218 +++----------- app/src/main/res/values-hr-rHR/strings.xml | 26 +- app/src/main/res/values-hr/strings.xml | 143 --------- app/src/main/res/values-hu/poestrings.xml | 22 -- app/src/main/res/values-hu/strings.xml | 218 +++----------- app/src/main/res/values-hy-rAM/strings.xml | 15 +- app/src/main/res/values-ia/strings.xml | 30 +- app/src/main/res/values-id/strings.xml | 199 ++---------- app/src/main/res/values-in-rID/poestrings.xml | 20 -- app/src/main/res/values-in-rID/strings.xml | 199 ++---------- app/src/main/res/values-in/strings.xml | 42 +-- app/src/main/res/values-is/poestrings.xml | 22 -- app/src/main/res/values-is/strings.xml | 218 +++----------- app/src/main/res/values-it/poestrings.xml | 22 -- app/src/main/res/values-it/strings.xml | 218 +++----------- app/src/main/res/values-iw/poestrings.xml | 22 -- app/src/main/res/values-iw/strings.xml | 172 ++--------- app/src/main/res/values-ja/poestrings.xml | 22 -- app/src/main/res/values-ja/strings.xml | 218 +++----------- app/src/main/res/values-kn-rIN/strings.xml | 1 - app/src/main/res/values-kn/strings.xml | 15 +- app/src/main/res/values-ko/strings.xml | 199 ++---------- app/src/main/res/values-ky/strings.xml | 22 +- app/src/main/res/values-lt-rLT/strings.xml | 1 - app/src/main/res/values-lt/poestrings.xml | 21 -- app/src/main/res/values-lt/strings.xml | 81 +---- app/src/main/res/values-lv/strings.xml | 199 ++---------- app/src/main/res/values-mk/poestrings.xml | 22 -- app/src/main/res/values-mk/strings.xml | 150 --------- app/src/main/res/values-ml/strings.xml | 20 +- app/src/main/res/values-mn/strings.xml | 13 +- app/src/main/res/values-mr-rIN/strings.xml | 4 +- app/src/main/res/values-ms-rMY/strings.xml | 146 ++------- app/src/main/res/values-ms/strings.xml | 153 ++-------- app/src/main/res/values-my/strings.xml | 32 +- app/src/main/res/values-nb/poestrings.xml | 17 -- app/src/main/res/values-nb/strings.xml | 207 ++----------- app/src/main/res/values-nl/poestrings.xml | 22 -- app/src/main/res/values-nl/strings.xml | 218 +++----------- app/src/main/res/values-pa/strings.xml | 22 +- app/src/main/res/values-pl/strings.xml | 203 ++----------- app/src/main/res/values-ps/strings.xml | 10 +- app/src/main/res/values-pt-rBR/poestrings.xml | 22 -- app/src/main/res/values-pt-rBR/strings.xml | 215 ++----------- app/src/main/res/values-pt-rPT/strings.xml | 102 ++----- app/src/main/res/values-pt/strings.xml | 135 ++------- app/src/main/res/values-ro-rRO/strings.xml | 26 +- app/src/main/res/values-ro/strings.xml | 199 ++---------- app/src/main/res/values-rs-rAR/strings.xml | 40 +-- app/src/main/res/values-ru/poestrings.xml | 21 -- app/src/main/res/values-ru/strings.xml | 218 +++----------- app/src/main/res/values-si-rLK/strings.xml | 146 ++------- app/src/main/res/values-sk-rSK/strings.xml | 8 +- app/src/main/res/values-sk/strings.xml | 199 ++---------- app/src/main/res/values-sl/strings.xml | 74 +---- app/src/main/res/values-sn/strings.xml | 21 +- app/src/main/res/values-sq/strings.xml | 42 +-- app/src/main/res/values-sr/strings.xml | 212 ++----------- app/src/main/res/values-sv/poestrings.xml | 22 -- app/src/main/res/values-sv/strings.xml | 218 +++----------- app/src/main/res/values-ta/poestrings.xml | 22 -- app/src/main/res/values-ta/strings.xml | 75 +---- app/src/main/res/values-th/poestrings.xml | 22 -- app/src/main/res/values-th/strings.xml | 218 +++----------- app/src/main/res/values-tl/strings.xml | 177 ++--------- app/src/main/res/values-tr/poestrings.xml | 22 -- app/src/main/res/values-tr/strings.xml | 150 --------- app/src/main/res/values-uk/poestrings.xml | 22 -- app/src/main/res/values-uk/strings.xml | 218 +++----------- app/src/main/res/values-ur/strings.xml | 23 +- app/src/main/res/values-uz/strings.xml | 47 +-- app/src/main/res/values-vi/strings.xml | 199 ++---------- app/src/main/res/values-zh-rCN/strings.xml | 204 ++----------- app/src/main/res/values-zh-rTW/poestrings.xml | 22 -- app/src/main/res/values-zh-rTW/strings.xml | 220 +++----------- app/src/main/res/values/arrays.xml | 8 +- app/src/main/res/values/colors.xml | 2 - app/src/main/res/values/dimens.xml | 128 +------- app/src/main/res/values/ic_launcher_background.xml | 4 +- app/src/main/res/values/poestrings.xml | 22 -- app/src/main/res/values/strings.xml | 165 +--------- app/src/main/res/values/styles.xml | 4 - .../src/main/res/drawable-hdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-hdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 0 bytes .../res/drawable-hdpi/ic_autorenew_black_36dp.png | Bin 546 -> 0 bytes .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 4194 -> 0 bytes .../src/main/res/drawable-hdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-ldpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-ldpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 0 bytes .../src/main/res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 0 bytes .../src/main/res/drawable-ldpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-mdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-mdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-mdpi/ic_action_settings.png | Bin 364 -> 0 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 2677 -> 0 bytes .../src/main/res/drawable-mdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xhdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xhdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 5964 -> 0 bytes .../src/main/res/drawable-xhdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 9556 -> 0 bytes .../src/main/res/drawable-xxhdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 13297 -> 0 bytes .../src/main/res/drawable-xxxhdpi/inverse.png | Bin 1027 -> 0 bytes .../res/layout/layout_notification_expanded.xml | 108 ------- orbotservice/src/main/res/raw/pluto.properties | 3 - orbotservice/src/main/res/values-ach/strings.xml | 1 - orbotservice/src/main/res/values-ar/strings.xml | 261 +--------------- orbotservice/src/main/res/values-az/strings.xml | 296 +----------------- orbotservice/src/main/res/values-bg/strings.xml | 292 +----------------- .../src/main/res/values-bn-rBD/strings.xml | 32 +- .../src/main/res/values-bn-rIN/strings.xml | 1 - orbotservice/src/main/res/values-bn/strings.xml | 1 - orbotservice/src/main/res/values-brx/strings.xml | 1 - orbotservice/src/main/res/values-bs/strings.xml | 11 +- orbotservice/src/main/res/values-ca/strings.xml | 225 +------------- .../src/main/res/values-cs-rCZ/strings.xml | 222 +------------- orbotservice/src/main/res/values-cs/strings.xml | 66 +--- orbotservice/src/main/res/values-cy/strings.xml | 75 +---- orbotservice/src/main/res/values-da/strings.xml | 201 +------------ .../src/main/res/values-de-rAT/strings.xml | 1 - orbotservice/src/main/res/values-de/strings.xml | 292 +----------------- orbotservice/src/main/res/values-el/strings.xml | 207 +------------ .../src/main/res/values-en-rGB/strings.xml | 4 +- orbotservice/src/main/res/values-eo/strings.xml | 146 +-------- .../src/main/res/values-es-rAR/strings.xml | 61 +--- orbotservice/src/main/res/values-es/strings.xml | 293 +----------------- orbotservice/src/main/res/values-et/strings.xml | 209 +------------ orbotservice/src/main/res/values-eu/strings.xml | 218 +------------- orbotservice/src/main/res/values-fa/strings.xml | 291 +----------------- orbotservice/src/main/res/values-fi/strings.xml | 278 +---------------- .../src/main/res/values-fr-rFR/strings.xml | 292 +----------------- orbotservice/src/main/res/values-fr/strings.xml | 39 +-- orbotservice/src/main/res/values-gl/strings.xml | 207 +------------ .../src/main/res/values-gu-rIN/strings.xml | 7 +- orbotservice/src/main/res/values-gu/strings.xml | 10 +- orbotservice/src/main/res/values-he/strings.xml | 231 +------------- orbotservice/src/main/res/values-hi/strings.xml | 19 +- .../src/main/res/values-hr-rHR/strings.xml | 27 +- orbotservice/src/main/res/values-hr/strings.xml | 292 +----------------- orbotservice/src/main/res/values-hu/strings.xml | 292 +----------------- .../src/main/res/values-hy-rAM/strings.xml | 1 - orbotservice/src/main/res/values-ia/strings.xml | 27 +- orbotservice/src/main/res/values-id/strings.xml | 283 +---------------- .../src/main/res/values-in-rID/strings.xml | 283 +---------------- orbotservice/src/main/res/values-in/strings.xml | 42 +-- orbotservice/src/main/res/values-is/strings.xml | 278 +---------------- orbotservice/src/main/res/values-it/strings.xml | 292 +----------------- orbotservice/src/main/res/values-iw/strings.xml | 231 +------------- orbotservice/src/main/res/values-ja/strings.xml | 292 +----------------- .../src/main/res/values-kn-rIN/strings.xml | 1 - orbotservice/src/main/res/values-kn/strings.xml | 1 - orbotservice/src/main/res/values-ko/strings.xml | 213 +------------ orbotservice/src/main/res/values-ky/strings.xml | 12 +- .../src/main/res/values-lt-rLT/strings.xml | 1 - orbotservice/src/main/res/values-lt/strings.xml | 23 +- orbotservice/src/main/res/values-lv/strings.xml | 278 +---------------- orbotservice/src/main/res/values-mk/strings.xml | 278 +---------------- orbotservice/src/main/res/values-ml/strings.xml | 1 - orbotservice/src/main/res/values-mn/strings.xml | 1 - .../src/main/res/values-mr-rIN/strings.xml | 1 - .../src/main/res/values-ms-rMY/strings.xml | 194 +----------- orbotservice/src/main/res/values-ms/strings.xml | 199 +----------- orbotservice/src/main/res/values-my/strings.xml | 27 +- orbotservice/src/main/res/values-nb/strings.xml | 258 +--------------- orbotservice/src/main/res/values-nl/strings.xml | 291 +----------------- orbotservice/src/main/res/values-pa/strings.xml | 12 +- orbotservice/src/main/res/values-pl/strings.xml | 292 +----------------- orbotservice/src/main/res/values-ps/strings.xml | 1 - .../src/main/res/values-pt-rBR/strings.xml | 284 +----------------- .../src/main/res/values-pt-rPT/strings.xml | 4 +- orbotservice/src/main/res/values-pt/strings.xml | 179 +---------- .../src/main/res/values-ro-rRO/strings.xml | 27 +- orbotservice/src/main/res/values-ro/strings.xml | 230 +------------- .../src/main/res/values-rs-rAR/strings.xml | 43 +-- orbotservice/src/main/res/values-ru/strings.xml | 292 +----------------- .../src/main/res/values-si-rLK/strings.xml | 188 +----------- .../src/main/res/values-sk-rSK/strings.xml | 8 +- orbotservice/src/main/res/values-sk/strings.xml | 38 +-- orbotservice/src/main/res/values-sl/strings.xml | 74 +---- orbotservice/src/main/res/values-sn/strings.xml | 14 +- orbotservice/src/main/res/values-sq/strings.xml | 27 +- orbotservice/src/main/res/values-sr/strings.xml | 197 +----------- orbotservice/src/main/res/values-sv/strings.xml | 292 +----------------- orbotservice/src/main/res/values-ta/strings.xml | 62 +--- orbotservice/src/main/res/values-th/strings.xml | 171 +---------- orbotservice/src/main/res/values-tl/strings.xml | 251 +--------------- orbotservice/src/main/res/values-tr/strings.xml | 279 +---------------- orbotservice/src/main/res/values-uk/strings.xml | 278 +---------------- orbotservice/src/main/res/values-ur/strings.xml | 9 +- orbotservice/src/main/res/values-uz/strings.xml | 42 +-- orbotservice/src/main/res/values-vi/strings.xml | 292 +----------------- .../src/main/res/values-zh-rCN/strings.xml | 297 +----------------- .../src/main/res/values-zh-rTW/strings.xml | 110 +------ orbotservice/src/main/res/values/dimens.xml | 334 --------------------- orbotservice/src/main/res/values/strings.xml | 327 +------------------- orbotservice/src/main/res/values/styles.xml | 5 - 304 files changed, 2375 insertions(+), 23672 deletions(-)

1 0

[orbot/master] Merge pull request #219 from bitmold/delete_minimalperm_manifest
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit dde1957d703b483330db6a4c5cf9fa1b7d77b8a2 Merge: a251d52f ad2e875b Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri May 31 10:49:51 2019 -0400 Merge pull request #219 from bitmold/delete_minimalperm_manifest Delete Minimalperm Manifest app/src/minimalperm/AndroidManifest.xml | 163 -------------------------------- 1 file changed, 163 deletions(-)

1 0

[orbot/master] Merge pull request #218 from bitmold/ndk_app_platform_warning
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit a251d52fe8ada9d55f6860e230c4cf7a55514542 Merge: eda464bb 917e49f5 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri May 31 10:49:35 2019 -0400 Merge pull request #218 from bitmold/ndk_app_platform_warning Removes APP_PLATFORM warning at the start of ndk-build orbotservice/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update tor-android to 0.4.0.4-rc
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit a1c5806adc3d73575c1ade48d0c611ff90540cc5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 31 10:47:36 2019 -0400 update tor-android to 0.4.0.4-rc --- orbotservice/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index df861342..7160e29d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation project(':jsocksAndroid') - implementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2' + implementation 'org.torproject:tor-android-binary:0.4.0.4-rc' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.jaredrummler:android-shell:1.0.0' implementation fileTree(dir: 'libs', include: ['.so'])

1 0

[orbot/master] update version to 16100003 aka 16.1.0-BETA-1-tor-0.4.0.4-rc
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 417e4fcd0720be57328d63a96d2c9fc0e119330f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 31 14:35:12 2019 -0400 update version to 16100003 aka 16.1.0-BETA-1-tor-0.4.0.4-rc --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1f471ab5..e99ca3b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 28 - versionCode 16060002 - versionName '16.0.6-BETA-2-tor-0.3.5.8' + versionCode 16100003 + versionName '16.1.0-BETA-1-tor-0.4.0.4-rc' archivesBaseName = "Orbot-$versionName" } }

1 0

[orbot/master] We no longer use the minimalperm product flavor so there's no need
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit ad2e875bc2084de6e809e44a1d213ad2791a0436 Author: bim <dsnake(a)protonmail.com> Date: Thu May 30 15:10:55 2019 -0400 We no longer use the minimalperm product flavor so there's no need to keep this manifest file in app/src --- app/src/minimalperm/AndroidManifest.xml | 163 -------------------------------- 1 file changed, 163 deletions(-) diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml deleted file mode 100644 index adf74209..00000000 --- a/app/src/minimalperm/AndroidManifest.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" - android:installLocation="auto"> - - <uses-sdk - android:minSdkVersion="16" - android:maxSdkVersion="22" - android:targetSdkVersion="22" /> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="android.permission.ACCESS_SUPERUSER" /> - - <application - android:name=".OrbotApp" - android:allowBackup="false" - android:allowClearUserData="true" - android:configChanges="locale|orientation|screenSize" - android:description="@string/app_description" - android:hardwareAccelerated="false" - android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:largeHeap="false" - android:theme="@style/DefaultTheme"> - <activity - android:name=".OrbotMainActivity" - android:excludeFromRecents="true" - android:launchMode="singleTop"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - - <data android:scheme="bridge" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - </activity> - -  - <activity - android:name=".service.util.DummyActivity" - android:allowTaskReparenting="true" - android:alwaysRetainTaskState="false" - android:clearTaskOnLaunch="true" - android:enabled="true" - android:excludeFromRecents="true" - android:finishOnTaskLaunch="true" - android:noHistory="true" - android:stateNotNeeded="true" - android:theme="@android:style/Theme.Translucent" /> - <activity - android:name=".vpn.VPNEnableActivity" - android:exported="false" - android:label="@string/app_name" /> - <activity - android:name=".ui.PromoAppsActivity" - android:exported="false" /> - <activity - android:name=".settings.SettingsPreferences" - android:label="@string/app_name" /> - <activity - android:name=".ui.AppManagerActivity" - android:label="@string/app_name" - android:theme="@style/Theme.AppCompat" /> - - <service - android:name=".service.TorService" - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false"></service> - <service - android:name=".service.vpn.TorVpnService" - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService" /> - </intent-filter> - </service> - - <receiver - android:name=".service.StartTorReceiver" - android:exported="true"> - <intent-filter> - <action android:name="org.torproject.android.intent.action.START" /> - </intent-filter> - </receiver> - <receiver - android:name=".OnBootReceiver" - android:enabled="true" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MEDIA_MOUNTED" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - </receiver> - - <activity - android:name=".ui.hiddenservices.HiddenServicesActivity" - android:label="@string/title_activity_hidden_services" - android:theme="@style/DefaultTheme"> - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value=".OrbotMainActivity" /> - </activity> - - <provider - android:name=".ui.hiddenservices.providers.HSContentProvider" - android:authorities="org.torproject.android.ui.hiddenservices.providers" - android:exported="false" /> - <provider - android:name="android.support.v4.content.FileProvider" - android:authorities="org.torproject.android.ui.hiddenservices.storage" - android:exported="false" - android:grantUriPermissions="true"> - <meta-data - android:name="android.support.FILE_PROVIDER_PATHS" - android:resource="@xml/hidden_services_paths" /> - </provider> - - <activity - android:name=".ui.hiddenservices.ClientCookiesActivity" - android:label="@string/client_cookies" - android:theme="@style/DefaultTheme"> - <meta-data - android:name="android.support.PARENT_ACTIVITY" - android:value=".OrbotMainActivity" /> - </activity> - - <provider - android:name=".ui.hiddenservices.providers.CookieContentProvider" - android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" - android:exported="false" /> - </application> - -</manifest>

1 0

[orbot/master] Merge branch 'issue_199' of https://github.com/sisbell/orbot into sisbell-issue_199
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit ff7d3dd5d523c94fb94894dcd664ff3501c598cc Merge: 7c2cfc3e 08c35bd3 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed May 29 17:02:40 2019 -0400 Merge branch 'issue_199' of https://github.com/sisbell/orbot into sisbell-issue_199 app/src/main/res/drawable-hdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-hdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../drawable-hdpi/ic_filter_none_black_36dp.png | Bin 232 -> 0 bytes .../ic_playlist_add_check_black_36dp.png | Bin 221 -> 0 bytes app/src/main/res/drawable-hdpi/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-ldpi/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-mdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-mdpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-xhdpi-v11/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable-xhdpi-v9/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable/button.xml | 37 --- app/src/main/res/drawable/button_off.xml | 37 --- app/src/main/res/drawable/button_on.xml | 35 --- app/src/main/res/drawable/error.png | Bin 2922 -> 0 bytes app/src/main/res/drawable/ic_menu_goto.png | Bin 1636 -> 0 bytes app/src/main/res/drawable/ic_play.png | Bin 3560 -> 0 bytes app/src/main/res/drawable/inverse.png | Bin 1027 -> 0 bytes app/src/main/res/drawable/n8fr8.jpg | Bin 18062 -> 0 bytes app/src/main/res/drawable/rounded_button.xml | 13 - app/src/main/res/drawable/toggle.xml | 8 - app/src/main/res/drawable/tor.png | Bin 4766 -> 0 bytes app/src/main/res/drawable/tor25.png | Bin 2227 -> 0 bytes app/src/main/res/layout/layout_about.xml | 4 +- .../res/layout/layout_add_client_cookie_dialog.xml | 2 - .../res/layout/layout_content_client_cookies.xml | 1 - app/src/main/res/layout/layout_help.xml | 20 -- .../res/layout/layout_hs_backups_list_item.xml | 1 - app/src/main/res/layout/layout_hs_data_dialog.xml | 3 - .../main/res/layout/layout_hs_list_view_main.xml | 1 - app/src/main/res/layout/layout_log.xml | 52 ---- app/src/main/res/layout/layout_main.xml | 12 +- app/src/main/res/layout/layout_orbot_control.xml | 10 - app/src/main/res/layout/layout_vpn_setup.xml | 34 --- .../main/res/layout/scrollingtext_buttons_view.xml | 34 --- app/src/main/res/menu/orbot_main.xml | 4 +- app/src/main/res/menu/share_menu.xml | 7 - app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 - app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2253 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 2146 -> 0 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4325 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1580 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 1376 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2723 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 3071 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 3075 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6103 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4682 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 5112 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 9447 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 6541 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 7372 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 13447 -> 0 bytes app/src/main/res/values-ach/strings.xml | 1 - app/src/main/res/values-ar/poestrings.xml | 18 -- app/src/main/res/values-ar/strings.xml | 152 ---------- app/src/main/res/values-ay/poestrings.xml | 24 -- app/src/main/res/values-ay/strings.xml | 150 --------- app/src/main/res/values-az/strings.xml | 201 ++----------- app/src/main/res/values-be/poestrings.xml | 21 -- app/src/main/res/values-be/strings.xml | 150 --------- app/src/main/res/values-bg/poestrings.xml | 22 -- app/src/main/res/values-bg/strings.xml | 199 ++---------- app/src/main/res/values-bn-rBD/strings.xml | 54 +--- app/src/main/res/values-bn-rIN/strings.xml | 10 +- app/src/main/res/values-bn/strings.xml | 26 +- app/src/main/res/values-brx/strings.xml | 7 +- app/src/main/res/values-bs/strings.xml | 14 +- app/src/main/res/values-ca/poestrings.xml | 22 -- app/src/main/res/values-ca/strings.xml | 218 +++----------- app/src/main/res/values-cs-rCZ/strings.xml | 197 ++---------- app/src/main/res/values-cs/strings.xml | 75 +---- app/src/main/res/values-cy/strings.xml | 69 +---- app/src/main/res/values-da/strings.xml | 156 ++-------- app/src/main/res/values-de-rAT/strings.xml | 1 - app/src/main/res/values-de/poestrings.xml | 21 -- app/src/main/res/values-de/strings.xml | 218 +++----------- app/src/main/res/values-el/poestrings.xml | 22 -- app/src/main/res/values-el/strings.xml | 218 +++----------- app/src/main/res/values-en-rGB/poestrings.xml | 22 -- app/src/main/res/values-en-rGB/strings.xml | 67 +---- app/src/main/res/values-eo/strings.xml | 109 ++----- app/src/main/res/values-es-rAR/poestrings.xml | 21 -- app/src/main/res/values-es-rAR/strings.xml | 167 ++--------- app/src/main/res/values-es/arrays.xml | 8 +- app/src/main/res/values-es/poestrings.xml | 22 -- app/src/main/res/values-es/strings.xml | 218 +++----------- app/src/main/res/values-et/strings.xml | 155 ++-------- app/src/main/res/values-eu/poestrings.xml | 21 -- app/src/main/res/values-eu/strings.xml | 218 +++----------- app/src/main/res/values-fa/poestrings.xml | 22 -- app/src/main/res/values-fa/strings.xml | 219 +++----------- app/src/main/res/values-fi/strings.xml | 143 --------- app/src/main/res/values-fr-rFR/strings.xml | 199 ++---------- app/src/main/res/values-fr/poestrings.xml | 21 -- app/src/main/res/values-fr/strings.xml | 218 +++----------- app/src/main/res/values-gl/poestrings.xml | 22 -- app/src/main/res/values-gl/strings.xml | 219 +++----------- app/src/main/res/values-gu-rIN/strings.xml | 4 +- app/src/main/res/values-gu/strings.xml | 15 +- app/src/main/res/values-he/strings.xml | 228 +++----------- app/src/main/res/values-hi/poestrings.xml | 21 -- app/src/main/res/values-hi/strings.xml | 218 +++----------- app/src/main/res/values-hr-rHR/strings.xml | 26 +- app/src/main/res/values-hr/strings.xml | 143 --------- app/src/main/res/values-hu/poestrings.xml | 22 -- app/src/main/res/values-hu/strings.xml | 218 +++----------- app/src/main/res/values-hy-rAM/strings.xml | 15 +- app/src/main/res/values-ia/strings.xml | 30 +- app/src/main/res/values-id/strings.xml | 199 ++---------- app/src/main/res/values-in-rID/poestrings.xml | 20 -- app/src/main/res/values-in-rID/strings.xml | 199 ++---------- app/src/main/res/values-in/strings.xml | 42 +-- app/src/main/res/values-is/poestrings.xml | 22 -- app/src/main/res/values-is/strings.xml | 218 +++----------- app/src/main/res/values-it/poestrings.xml | 22 -- app/src/main/res/values-it/strings.xml | 218 +++----------- app/src/main/res/values-iw/poestrings.xml | 22 -- app/src/main/res/values-iw/strings.xml | 172 ++--------- app/src/main/res/values-ja/poestrings.xml | 22 -- app/src/main/res/values-ja/strings.xml | 218 +++----------- app/src/main/res/values-kn-rIN/strings.xml | 1 - app/src/main/res/values-kn/strings.xml | 15 +- app/src/main/res/values-ko/strings.xml | 199 ++---------- app/src/main/res/values-ky/strings.xml | 22 +- app/src/main/res/values-lt-rLT/strings.xml | 1 - app/src/main/res/values-lt/poestrings.xml | 21 -- app/src/main/res/values-lt/strings.xml | 81 +---- app/src/main/res/values-lv/strings.xml | 199 ++---------- app/src/main/res/values-mk/poestrings.xml | 22 -- app/src/main/res/values-mk/strings.xml | 150 --------- app/src/main/res/values-ml/strings.xml | 20 +- app/src/main/res/values-mn/strings.xml | 13 +- app/src/main/res/values-mr-rIN/strings.xml | 4 +- app/src/main/res/values-ms-rMY/strings.xml | 146 ++------- app/src/main/res/values-ms/strings.xml | 153 ++-------- app/src/main/res/values-my/strings.xml | 32 +- app/src/main/res/values-nb/poestrings.xml | 17 -- app/src/main/res/values-nb/strings.xml | 207 ++----------- app/src/main/res/values-nl/poestrings.xml | 22 -- app/src/main/res/values-nl/strings.xml | 218 +++----------- app/src/main/res/values-pa/strings.xml | 22 +- app/src/main/res/values-pl/strings.xml | 203 ++----------- app/src/main/res/values-ps/strings.xml | 10 +- app/src/main/res/values-pt-rBR/poestrings.xml | 22 -- app/src/main/res/values-pt-rBR/strings.xml | 215 ++----------- app/src/main/res/values-pt-rPT/strings.xml | 102 ++----- app/src/main/res/values-pt/strings.xml | 135 ++------- app/src/main/res/values-ro-rRO/strings.xml | 26 +- app/src/main/res/values-ro/strings.xml | 199 ++---------- app/src/main/res/values-rs-rAR/strings.xml | 40 +-- app/src/main/res/values-ru/poestrings.xml | 21 -- app/src/main/res/values-ru/strings.xml | 218 +++----------- app/src/main/res/values-si-rLK/strings.xml | 146 ++------- app/src/main/res/values-sk-rSK/strings.xml | 8 +- app/src/main/res/values-sk/strings.xml | 199 ++---------- app/src/main/res/values-sl/strings.xml | 74 +---- app/src/main/res/values-sn/strings.xml | 21 +- app/src/main/res/values-sq/strings.xml | 42 +-- app/src/main/res/values-sr/strings.xml | 212 ++----------- app/src/main/res/values-sv/poestrings.xml | 22 -- app/src/main/res/values-sv/strings.xml | 218 +++----------- app/src/main/res/values-ta/poestrings.xml | 22 -- app/src/main/res/values-ta/strings.xml | 75 +---- app/src/main/res/values-th/poestrings.xml | 22 -- app/src/main/res/values-th/strings.xml | 218 +++----------- app/src/main/res/values-tl/strings.xml | 177 ++--------- app/src/main/res/values-tr/poestrings.xml | 22 -- app/src/main/res/values-tr/strings.xml | 150 --------- app/src/main/res/values-uk/poestrings.xml | 22 -- app/src/main/res/values-uk/strings.xml | 218 +++----------- app/src/main/res/values-ur/strings.xml | 23 +- app/src/main/res/values-uz/strings.xml | 47 +-- app/src/main/res/values-vi/strings.xml | 199 ++---------- app/src/main/res/values-zh-rCN/strings.xml | 204 ++----------- app/src/main/res/values-zh-rTW/poestrings.xml | 22 -- app/src/main/res/values-zh-rTW/strings.xml | 220 +++----------- app/src/main/res/values/arrays.xml | 8 +- app/src/main/res/values/colors.xml | 2 - app/src/main/res/values/dimens.xml | 128 +------- app/src/main/res/values/ic_launcher_background.xml | 4 +- app/src/main/res/values/poestrings.xml | 22 -- app/src/main/res/values/strings.xml | 165 +--------- app/src/main/res/values/styles.xml | 4 - .../src/main/res/drawable-hdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-hdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 0 bytes .../res/drawable-hdpi/ic_autorenew_black_36dp.png | Bin 546 -> 0 bytes .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 4194 -> 0 bytes .../src/main/res/drawable-hdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-ldpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-ldpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 0 bytes .../src/main/res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 0 bytes .../src/main/res/drawable-ldpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-mdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-mdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-mdpi/ic_action_settings.png | Bin 364 -> 0 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 2677 -> 0 bytes .../src/main/res/drawable-mdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xhdpi-v11/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xhdpi-v9/inverse.png | Bin 1027 -> 0 bytes .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 5964 -> 0 bytes .../src/main/res/drawable-xhdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 9556 -> 0 bytes .../src/main/res/drawable-xxhdpi/inverse.png | Bin 1027 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 13297 -> 0 bytes .../src/main/res/drawable-xxxhdpi/inverse.png | Bin 1027 -> 0 bytes .../res/layout/layout_notification_expanded.xml | 108 ------- orbotservice/src/main/res/raw/pluto.properties | 3 - orbotservice/src/main/res/values-ach/strings.xml | 1 - orbotservice/src/main/res/values-ar/strings.xml | 261 +--------------- orbotservice/src/main/res/values-az/strings.xml | 296 +----------------- orbotservice/src/main/res/values-bg/strings.xml | 292 +----------------- .../src/main/res/values-bn-rBD/strings.xml | 32 +- .../src/main/res/values-bn-rIN/strings.xml | 1 - orbotservice/src/main/res/values-bn/strings.xml | 1 - orbotservice/src/main/res/values-brx/strings.xml | 1 - orbotservice/src/main/res/values-bs/strings.xml | 11 +- orbotservice/src/main/res/values-ca/strings.xml | 225 +------------- .../src/main/res/values-cs-rCZ/strings.xml | 222 +------------- orbotservice/src/main/res/values-cs/strings.xml | 66 +--- orbotservice/src/main/res/values-cy/strings.xml | 75 +---- orbotservice/src/main/res/values-da/strings.xml | 201 +------------ .../src/main/res/values-de-rAT/strings.xml | 1 - orbotservice/src/main/res/values-de/strings.xml | 292 +----------------- orbotservice/src/main/res/values-el/strings.xml | 207 +------------ .../src/main/res/values-en-rGB/strings.xml | 4 +- orbotservice/src/main/res/values-eo/strings.xml | 146 +-------- .../src/main/res/values-es-rAR/strings.xml | 61 +--- orbotservice/src/main/res/values-es/strings.xml | 293 +----------------- orbotservice/src/main/res/values-et/strings.xml | 209 +------------ orbotservice/src/main/res/values-eu/strings.xml | 218 +------------- orbotservice/src/main/res/values-fa/strings.xml | 291 +----------------- orbotservice/src/main/res/values-fi/strings.xml | 278 +---------------- .../src/main/res/values-fr-rFR/strings.xml | 292 +----------------- orbotservice/src/main/res/values-fr/strings.xml | 39 +-- orbotservice/src/main/res/values-gl/strings.xml | 207 +------------ .../src/main/res/values-gu-rIN/strings.xml | 7 +- orbotservice/src/main/res/values-gu/strings.xml | 10 +- orbotservice/src/main/res/values-he/strings.xml | 231 +------------- orbotservice/src/main/res/values-hi/strings.xml | 19 +- .../src/main/res/values-hr-rHR/strings.xml | 27 +- orbotservice/src/main/res/values-hr/strings.xml | 292 +----------------- orbotservice/src/main/res/values-hu/strings.xml | 292 +----------------- .../src/main/res/values-hy-rAM/strings.xml | 1 - orbotservice/src/main/res/values-ia/strings.xml | 27 +- orbotservice/src/main/res/values-id/strings.xml | 283 +---------------- .../src/main/res/values-in-rID/strings.xml | 283 +---------------- orbotservice/src/main/res/values-in/strings.xml | 42 +-- orbotservice/src/main/res/values-is/strings.xml | 278 +---------------- orbotservice/src/main/res/values-it/strings.xml | 292 +----------------- orbotservice/src/main/res/values-iw/strings.xml | 231 +------------- orbotservice/src/main/res/values-ja/strings.xml | 292 +----------------- .../src/main/res/values-kn-rIN/strings.xml | 1 - orbotservice/src/main/res/values-kn/strings.xml | 1 - orbotservice/src/main/res/values-ko/strings.xml | 213 +------------ orbotservice/src/main/res/values-ky/strings.xml | 12 +- .../src/main/res/values-lt-rLT/strings.xml | 1 - orbotservice/src/main/res/values-lt/strings.xml | 23 +- orbotservice/src/main/res/values-lv/strings.xml | 278 +---------------- orbotservice/src/main/res/values-mk/strings.xml | 278 +---------------- orbotservice/src/main/res/values-ml/strings.xml | 1 - orbotservice/src/main/res/values-mn/strings.xml | 1 - .../src/main/res/values-mr-rIN/strings.xml | 1 - .../src/main/res/values-ms-rMY/strings.xml | 194 +----------- orbotservice/src/main/res/values-ms/strings.xml | 199 +----------- orbotservice/src/main/res/values-my/strings.xml | 27 +- orbotservice/src/main/res/values-nb/strings.xml | 258 +--------------- orbotservice/src/main/res/values-nl/strings.xml | 291 +----------------- orbotservice/src/main/res/values-pa/strings.xml | 12 +- orbotservice/src/main/res/values-pl/strings.xml | 292 +----------------- orbotservice/src/main/res/values-ps/strings.xml | 1 - .../src/main/res/values-pt-rBR/strings.xml | 284 +----------------- .../src/main/res/values-pt-rPT/strings.xml | 4 +- orbotservice/src/main/res/values-pt/strings.xml | 179 +---------- .../src/main/res/values-ro-rRO/strings.xml | 27 +- orbotservice/src/main/res/values-ro/strings.xml | 230 +------------- .../src/main/res/values-rs-rAR/strings.xml | 43 +-- orbotservice/src/main/res/values-ru/strings.xml | 292 +----------------- .../src/main/res/values-si-rLK/strings.xml | 188 +----------- .../src/main/res/values-sk-rSK/strings.xml | 8 +- orbotservice/src/main/res/values-sk/strings.xml | 38 +-- orbotservice/src/main/res/values-sl/strings.xml | 74 +---- orbotservice/src/main/res/values-sn/strings.xml | 14 +- orbotservice/src/main/res/values-sq/strings.xml | 27 +- orbotservice/src/main/res/values-sr/strings.xml | 197 +----------- orbotservice/src/main/res/values-sv/strings.xml | 292 +----------------- orbotservice/src/main/res/values-ta/strings.xml | 62 +--- orbotservice/src/main/res/values-th/strings.xml | 171 +---------- orbotservice/src/main/res/values-tl/strings.xml | 251 +--------------- orbotservice/src/main/res/values-tr/strings.xml | 279 +---------------- orbotservice/src/main/res/values-uk/strings.xml | 278 +---------------- orbotservice/src/main/res/values-ur/strings.xml | 9 +- orbotservice/src/main/res/values-uz/strings.xml | 42 +-- orbotservice/src/main/res/values-vi/strings.xml | 292 +----------------- .../src/main/res/values-zh-rCN/strings.xml | 297 +----------------- .../src/main/res/values-zh-rTW/strings.xml | 110 +------ orbotservice/src/main/res/values/dimens.xml | 334 --------------------- orbotservice/src/main/res/values/strings.xml | 327 +------------------- orbotservice/src/main/res/values/styles.xml | 5 - 304 files changed, 2375 insertions(+), 23672 deletions(-)

1 0

[orbot/master] Removes warning on ndk-build where the target API for NDK (16) is
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 917e49f55dba8ba4cafeb24ee6372c9cba01e1ae Author: bim <dsnake(a)protonmail.com> Date: Thu May 30 14:12:42 2019 -0400 Removes warning on ndk-build where the target API for NDK (16) is greater than the sdk version defined for the project. Since nothing was specified in the manifest it defaulted to 1 but we can set this to Orbot's minSdkVersion of 16 to get rid of this warning --- orbotservice/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml index 4b1691d7..0f70c64b 100644 --- a/orbotservice/src/main/AndroidManifest.xml +++ b/orbotservice/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android.service"> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - + <uses-sdk android:minSdkVersion="16"/> </manifest>

1 0

[orbot/master] remove hardcoded port values, make it all dynamic
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 397391f0580c4997444bfb520fe13c64fa6c973f Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 4 05:27:22 2019 -0400 remove hardcoded port values, make it all dynamic --- app/src/main/res/xml/preferences.xml | 6 ++-- .../org/torproject/android/service/TorService.java | 39 +++++++++++++++------- .../android/service/TorServiceConstants.java | 19 ++++++----- .../android/service/vpn/OrbotVpnManager.java | 11 +++--- 4 files changed, 45 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 1f49d58b..53aa5ecd 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -244,7 +244,7 @@ <PreferenceCategory android:title="Debug"> <EditTextPreference - android:defaultValue="9050" + android:defaultValue="auto" android:dialogTitle="@string/pref_socks_dialog" android:inputType="number" android:key="pref_socks" @@ -252,7 +252,7 @@ android:title="@string/pref_socks_title" /> <EditTextPreference - android:defaultValue="9040" + android:defaultValue="auto" android:dialogTitle="@string/pref_transport_dialog" android:inputType="number" android:key="pref_transport" @@ -260,7 +260,7 @@ android:title="@string/pref_transport_title" /> <EditTextPreference - android:defaultValue="5400" + android:defaultValue="auto" android:dialogTitle="@string/pref_dnsport_dialog" android:inputType="number" android:key="pref_dnsport" diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 4517a106..9d88aeb9 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -9,6 +9,7 @@ package org.torproject.android.service; import android.annotation.SuppressLint; +import android.app.Application; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -28,6 +29,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; import android.os.Build; +import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; import android.provider.BaseColumns; @@ -89,8 +91,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private TorControlConnection conn = null; private int mLastProcessId = -1; - public static int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT; - public static int mPortHTTP = HTTP_PROXY_PORT_DEFAULT; + public static int mPortSOCKS = -1; + public static int mPortHTTP = -1; public static int mPortDns = TOR_DNS_PORT_DEFAULT; public static int mPortTrans = TOR_TRANSPROXY_PORT_DEFAULT; @@ -132,6 +134,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs"); private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie"); + private Handler mHandler; + public static final class HiddenService implements BaseColumns { public static final String NAME = "name"; public static final String PORT = "port"; @@ -510,16 +514,18 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { + mHandler = new Handler (); + appBinHome = getFilesDir();//getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); if (!appBinHome.exists()) appBinHome.mkdirs(); - appCacheHome = getCacheDir();// getDir(TorServiceConstants.DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); + appCacheHome = getDir(DIRECTORY_TOR_DATA, Application.MODE_PRIVATE); if (!appCacheHome.exists()) appCacheHome.mkdirs(); - fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY); - fileControlPort = new File(getFilesDir(), "control.txt"); + fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); + fileControlPort = new File(getFilesDir(), TOR_CONTROL_PORT_FILE); mHSBasePath = new File( getFilesDir().getAbsolutePath(), @@ -682,9 +688,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon extraLines.append("SocksListenAddress 0.0.0.0").append('\n'); - - String httpPortPref = HTTP_PROXY_PORT_DEFAULT + ""; - extraLines.append("HTTPTunnelPort ").append(checkPortOrAuto(httpPortPref)).append('\n'); + extraLines.append("HTTPTunnelPort ").append(checkPortOrAuto(HTTP_PROXY_PORT_DEFAULT)).append('\n'); if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) { @@ -1922,10 +1926,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void startVPNService () { - Intent intentVpn = new Intent(this,TorVpnService.class); - intentVpn.setAction("start"); - intentVpn.putExtra("torSocks",mPortSOCKS); - startService(intentVpn); + if (mPortSOCKS != -1) { + Intent intentVpn = new Intent(this, TorVpnService.class); + intentVpn.setAction("start"); + intentVpn.putExtra("torSocks", mPortSOCKS); + startService(intentVpn); + } + else + { + mHandler.postDelayed(new Runnable() { + public void run () + { + startVPNService(); + } + },5000); + } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index e02c8f81..22a6ea29 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -11,8 +11,10 @@ public interface TorServiceConstants { String BROWSER_APP_USERNAME = "info.guardianproject.orfox"; //String DIRECTORY_TOR_BINARY = "bin"; - //String DIRECTORY_TOR_DATA = "data"; - + String DIRECTORY_TOR_DATA = "data"; + + String TOR_CONTROL_PORT_FILE = "control.txt"; + //name of the tor C binary String TOR_ASSET_KEY = "tor"; @@ -51,18 +53,17 @@ public interface TorServiceConstants { int FILE_WRITE_BUFFER_SIZE = 1024; String IP_LOCALHOST = "127.0.0.1"; - int UPDATE_TIMEOUT = 1000; +// int UPDATE_TIMEOUT = 1000; int TOR_TRANSPROXY_PORT_DEFAULT = 9040; - int STANDARD_DNS_PORT = 53; +// int STANDARD_DNS_PORT = 53; int TOR_DNS_PORT_DEFAULT = 5400; - String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; +// String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; - int CONTROL_PORT_DEFAULT = 9051; - int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy! - int SOCKS_PROXY_PORT_DEFAULT = 9050; +// int CONTROL_PORT_DEFAULT = 9051; + String HTTP_PROXY_PORT_DEFAULT = "auto"; // like Privoxy! + String SOCKS_PROXY_PORT_DEFAULT = "auto"; - //path to check Tor against String URL_TOR_CHECK = "https://check.torproject.org"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 2db02389..e7675001 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -62,8 +62,8 @@ public class OrbotVpnManager implements Handler.Callback { private String mSessionName = "OrbotVPN"; private ParcelFileDescriptor mInterface; - private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; - + private int mTorSocks = -1; + public static int sSocksProxyServerPort = -1; public static String sSocksProxyLocalhost = null; private ProxyServer mSocksProxyServer; @@ -110,8 +110,8 @@ public class OrbotVpnManager implements Handler.Callback { if (mThreadVPN == null || (!mThreadVPN.isAlive())) { Log.d(TAG,"starting OrbotVPNService service!"); - - mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); + + mTorSocks = intent.getIntExtra("torSocks", -1); if (!mIsLollipop) { @@ -303,8 +303,7 @@ public class OrbotVpnManager implements Handler.Callback { final String dummyDNS = "1.1.1.1"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start final String defaultRoute = "0.0.0.0"; - final String localSocks = localhost + ':' - + String.valueOf(mTorSocks); + final String localSocks = localhost + ':' + mTorSocks; final String localDNS = virtualGateway + ':' + PDNSD_PORT;

1 0

[orbot/master] fix pdnsd/VPN support
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 7ae000d0c2a59c2257f2779de42ad48b4b4080d0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri May 31 14:28:26 2019 -0400 fix pdnsd/VPN support --- .gitignore | 8 +- .../org/torproject/android/service/TorService.java | 5 +- .../android/service/TorServiceConstants.java | 3 - .../android/service/util/CustomNativeLoader.java | 32 --- .../service/util/CustomTorResourceInstaller.java | 57 +----- .../service/util/OtherResourceInstaller.java | 228 --------------------- .../android/service/vpn/OrbotVpnManager.java | 21 +- .../android/service/vpn/PDNSDInstaller.java | 195 ++++++++++++++++++ .../android/service/vpn/TorVpnService.java | 11 +- .../src/main/libs/arm64-v8a/libtun2socks.so | Bin 0 -> 196640 bytes orbotservice/src/main/libs/arm64-v8a/pdnsd.so | Bin 0 -> 207224 bytes .../src/main/libs/armeabi-v7a/libtun2socks.so | Bin 0 -> 137836 bytes orbotservice/src/main/libs/armeabi-v7a/pdnsd.so | Bin 0 -> 169824 bytes orbotservice/src/main/libs/armeabi/libtun2socks.so | Bin 0 -> 146024 bytes orbotservice/src/main/libs/armeabi/pdnsd.so | Bin 0 -> 178012 bytes orbotservice/src/main/libs/x86/libtun2socks.so | Bin 0 -> 195120 bytes orbotservice/src/main/libs/x86/pdnsd.so | Bin 0 -> 202532 bytes orbotservice/src/main/libs/x86_64/libtun2socks.so | Bin 0 -> 196920 bytes orbotservice/src/main/libs/x86_64/pdnsd.so | Bin 0 -> 219696 bytes 19 files changed, 225 insertions(+), 335 deletions(-) diff --git a/.gitignore b/.gitignore index a8f09edc..a6294876 100644 --- a/.gitignore +++ b/.gitignore @@ -64,10 +64,10 @@ obj app/src/main/jniLibs/ app/src/main/libs/ -orbotservice/src/main/libs/ -orbotservice/src/main/jniLibs/ -orbotservice/src/main/assets/armeabi/ -orbotservice/src/main/assets/x86/ +#orbotservice/src/main/libs/ +#orbotservice/src/main/jniLibs/ +#orbotservice/src/main/assets/armeabi/ +#orbotservice/src/main/assets/x86/ # emacs *~ diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 6f9f6c12..2561a132 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -44,7 +44,7 @@ import org.torproject.android.control.TorControlConnection; import org.torproject.android.service.util.CustomShell; import org.torproject.android.service.util.CustomTorResourceInstaller; import org.torproject.android.service.util.DummyActivity; -import org.torproject.android.service.util.OtherResourceInstaller; +import org.torproject.android.service.vpn.PDNSDInstaller; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.util.Utils; @@ -603,9 +603,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (!fileTorRc.exists()) return false; - OtherResourceInstaller oInstaller = new OtherResourceInstaller(this, appBinHome); - oInstaller.installResources(); - isTorUpgradeAndConfigComplete = true; return true; diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index b557de80..e02c8f81 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -143,9 +143,6 @@ public interface TorServiceConstants { // String MEEK_ASSET_KEY = "meek-client"; - //DNS daemon for TCP DNS over TOr - String PDNSD_ASSET_KEY = "pdnsd"; - //EXIT COUNTRY CODES String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java index bae4b068..0df6784a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java @@ -74,38 +74,6 @@ public class CustomNativeLoader { try { String folder = Build.CPU_ABI; - /** - try { - - if (Build.CPU_ABI.equalsIgnoreCase("arm64-v8a")) { - folder = "arm64-v8a"; - } - else if (Build.CPU_ABI.equalsIgnoreCase("arm64")) { - folder = "arm64"; - } - else if (Build.CPU_ABI.equalsIgnoreCase("x86_64")) { - folder = "x86_64"; - } - else if (Build.CPU_ABI.equalsIgnoreCase("armeabi-v7a")) { - folder = "armeabi-v7a"; - } - else if (Build.CPU_ABI.equalsIgnoreCase("armeabi")) { - folder = "armeabi"; - } else if (Build.CPU_ABI.equalsIgnoreCase("x86")) { - folder = "x86"; - } else if (Build.CPU_ABI.equalsIgnoreCase("mips")) { - folder = "mips"; - } else { - folder = "armeabi"; - //FileLog.e("tmessages", "Unsupported arch: " + Build.CPU_ABI); - } - - } catch (Exception e) { - // FileLog.e("tmessages", e); - Log.e(TAG, e.getMessage(),e); - folder = "armeabi"; - }**/ - String javaArch = System.getProperty("os.arch"); if (javaArch != null && javaArch.contains("686")) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java index 043987e2..7e9dcc55 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomTorResourceInstaller.java @@ -4,30 +4,26 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.util.Log; -import org.torproject.android.binary.NativeLoader; import org.torproject.android.binary.TorServiceConstants; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import java.util.concurrent.TimeoutException; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; - public class CustomTorResourceInstaller implements TorServiceConstants { - File installFolder; - Context context; + private File installFolder; + private Context context; - File fileTorrc; - File fileTor; + private File fileTorrc; + private File fileTor; public CustomTorResourceInstaller (Context context, File installFolder) { @@ -35,35 +31,6 @@ public class CustomTorResourceInstaller implements TorServiceConstants { this.context = context; } - public File getTorrcFile () - { - return fileTorrc; - } - - public File getTorFile () - { - return fileTor; - } - - /** - private void deleteDirectory(File file) { - if( file.exists() ) { - if (file.isDirectory()) { - File[] files = file.listFiles(); - for(int i=0; i<files.length; i++) { - if(files[i].isDirectory()) { - deleteDirectory(files[i]); - } - else { - files[i].delete(); - } - } - } - - file.delete(); - } - }**/ - // /* * Extract the Tor resources from the APK file using ZIP @@ -127,23 +94,7 @@ public class CustomTorResourceInstaller implements TorServiceConstants { } - public boolean updateTorConfigCustom (File fileTorRcCustom, String extraLines) throws IOException, FileNotFoundException, TimeoutException - { - if (fileTorRcCustom.exists()) - { - fileTorRcCustom.delete(); - Log.d("torResources","deleting existing torrc.custom"); - } - else - fileTorRcCustom.createNewFile(); - FileOutputStream fos = new FileOutputStream(fileTorRcCustom, false); - PrintStream ps = new PrintStream(fos); - ps.print(extraLines); - ps.close(); - - return true; - } /* * Extract the Tor binary from the APK file using ZIP diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java deleted file mode 100644 index 241f6c7e..00000000 --- a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java +++ /dev/null @@ -1,228 +0,0 @@ -package org.torproject.android.service.util; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.io.StringBufferInputStream; -import java.util.ArrayList; -import java.util.concurrent.TimeoutException; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.os.Build; -import android.util.Log; - -import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.R; -import org.torproject.android.service.TorServiceConstants; - -public class OtherResourceInstaller implements TorServiceConstants { - - - File installFolder; - Context context; - - public OtherResourceInstaller (Context context, File installFolder) - { - this.installFolder = installFolder; - - this.context = context; - } - - public void deleteDirectory(File file) { - if( file.exists() ) { - if (file.isDirectory()) { - File[] files = file.listFiles(); - for(int i=0; i<files.length; i++) { - if(files[i].isDirectory()) { - deleteDirectory(files[i]); - } - else { - files[i].delete(); - } - } - } - - file.delete(); - } - } - - private final static String COMMAND_RM_FORCE = "rm -f "; - private final static String MP3_EXT = ".mp3"; - // - /* - * Extract the Tor resources from the APK file using ZIP - */ - public boolean installResources () throws IOException - { - - File outFile; - - if (!installFolder.exists()) - installFolder.mkdirs(); - - outFile = new File(installFolder, PDNSD_ASSET_KEY); - NativeLoader.initNativeLibs(context,PDNSD_ASSET_KEY,outFile); - -// outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY); - // NativeLoader.initNativeLibs(context,OBFSCLIENT_ASSET_KEY,outFile); - - return true; - } - - // Return Full path to the directory where native JNI libraries are stored. - public static String getNativeLibraryDir(Context context) { - ApplicationInfo appInfo = context.getApplicationInfo(); - return appInfo.nativeLibraryDir; - } - - public boolean updateTorConfigCustom (File fileTorRcCustom, String extraLines) throws IOException, FileNotFoundException, TimeoutException - { - if (fileTorRcCustom.exists()) - { - fileTorRcCustom.delete(); - Log.d("torResources","deleting existing torrc.custom"); - } - else - fileTorRcCustom.createNewFile(); - - FileOutputStream fos = new FileOutputStream(fileTorRcCustom, false); - PrintStream ps = new PrintStream(fos); - ps.print(extraLines); - ps.close(); - - return true; - } - - - /* - * Write the inputstream contents to the file - */ - public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException - - { - byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; - - int bytecount; - - OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append); - ZipInputStream zis = null; - - if (zip) - { - zis = new ZipInputStream(stm); - ZipEntry ze = zis.getNextEntry(); - stm = zis; - - } - - while ((bytecount = stm.read(buffer)) > 0) - { - - stmOut.write(buffer, 0, bytecount); - - } - - stmOut.close(); - stm.close(); - - if (zis != null) - zis.close(); - - - return true; - - } - - //copy the file from inputstream to File output - alternative impl - public static boolean copyFile (InputStream is, File outputFile) - { - - try { - if (outputFile.exists()) - outputFile.delete(); - - boolean newFile = outputFile.createNewFile(); - DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile)); - DataInputStream in = new DataInputStream(is); - - int b = -1; - byte[] data = new byte[1024]; - - while ((b = in.read(data)) != -1) { - out.write(data); - } - - if (b == -1); //rejoice - - // - out.flush(); - out.close(); - in.close(); - // chmod? - - return newFile; - - - } catch (IOException ex) { - Log.e(OrbotConstants.TAG, "error copying binary", ex); - return false; - } - - } - - - - - /** - * Copies a raw resource file, given its ID to the given location - * @param ctx context - * @param resid resource id - * @param file destination file - * @param mode file permissions (E.g.: "755") - * @throws IOException on error - * @throws InterruptedException when interrupted - */ - public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException - { - final String abspath = file.getAbsolutePath(); - // Write the iptables binary - final FileOutputStream out = new FileOutputStream(file); - InputStream is = ctx.getResources().openRawResource(resid); - - if (isZipd) - { - ZipInputStream zis = new ZipInputStream(is); - ZipEntry ze = zis.getNextEntry(); - is = zis; - } - - byte buf[] = new byte[1024]; - int len; - while ((len = is.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.close(); - is.close(); - // Change the permissions - Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor(); - } - - - private void setExecutable(File fileBin) { - fileBin.setReadable(true); - fileBin.setExecutable(true); - fileBin.setWritable(false); - fileBin.setWritable(true, true); - } - -} diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 90a13336..b5f294f4 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -87,12 +87,10 @@ public class OrbotVpnManager implements Handler.Callback { private VpnService mService; - public OrbotVpnManager (VpnService service) - { + public OrbotVpnManager (VpnService service) throws IOException, TimeoutException { mService = service; - File fileBinHome = service.getFilesDir();//mService.getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); - filePdnsd = new File(fileBinHome,TorServiceConstants.PDNSD_ASSET_KEY); + filePdnsd = new PDNSDInstaller(service.getApplicationContext(),service.getFilesDir()).installResources(); Tun2Socks.init(); @@ -344,13 +342,13 @@ public class OrbotVpnManager implements Handler.Callback { mInterface = newInterface; - Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , localDnsTransparentProxy); - isRestart = false; //start PDNSD daemon pointing to actual DNS startDNS("127.0.0.1",localDns); + Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , localDnsTransparentProxy); + } catch (Exception e) @@ -411,11 +409,11 @@ public class OrbotVpnManager implements Handler.Callback { private void startDNS (String dns, int port) throws IOException, TimeoutException { - makePdnsdConf(mService, dns, port,filePdnsd.getParentFile()); + File fileConf = makePdnsdConf(mService, dns, port,mService.getFilesDir()); - ArrayList<String> customEnv = new ArrayList<String>(); + // ArrayList<String> customEnv = new ArrayList<String>(); - String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",filePdnsd.getParent() + "/pdnsd.conf"}; + String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",fileConf.toString()}; ProcessBuilder pb = new ProcessBuilder(cmdString); pb.redirectErrorStream(true); Process proc = pb.start(); @@ -425,6 +423,7 @@ public class OrbotVpnManager implements Handler.Callback { if (proc.exitValue() != 0) { + BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = null; @@ -437,7 +436,7 @@ public class OrbotVpnManager implements Handler.Callback { } - public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException, IOException { + public static File makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException, IOException { String conf = String.format(context.getString(R.string.pdnsd_conf), dns, port, fileDir.getCanonicalPath()); File f = new File(fileDir,"pdnsd.conf"); @@ -460,6 +459,8 @@ public class OrbotVpnManager implements Handler.Callback { } } + + return f; } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/PDNSDInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/PDNSDInstaller.java new file mode 100644 index 00000000..58caffad --- /dev/null +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/PDNSDInstaller.java @@ -0,0 +1,195 @@ +package org.torproject.android.service.vpn; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.StringBufferInputStream; +import java.util.ArrayList; +import java.util.concurrent.TimeoutException; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipInputStream; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.util.Log; + +import org.torproject.android.service.OrbotConstants; +import org.torproject.android.service.R; +import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.service.util.CustomNativeLoader; +import org.torproject.android.service.util.NativeLoader; + +public class PDNSDInstaller implements TorServiceConstants { + + private final static String LIB_NAME = "pdnsd"; + private final static String LIB_SO_NAME = "pdnsd.so"; + + private final static String TAG = "TorNativeLoader"; + + private File installFolder; + private Context context; + private File filePdnsd; + + public PDNSDInstaller (Context context, File installFolder) + { + this.installFolder = installFolder; + this.context = context; + } + + // + /* + * Extract the Tor resources from the APK file using ZIP + * + * @File path to the Tor executable + */ + public File installResources () throws IOException, TimeoutException + { + + filePdnsd = new File(installFolder, LIB_NAME); + + if (!installFolder.exists()) + installFolder.mkdirs(); + + File fileNativeDir = new File(getNativeLibraryDir(context)); + filePdnsd = new File(fileNativeDir,LIB_NAME + ".so"); + + if (filePdnsd.exists()) + { + if (filePdnsd.canExecute()) + return filePdnsd; + else + { + setExecutable(filePdnsd); + + if (filePdnsd.canExecute()) + return filePdnsd; + } + } + + if (filePdnsd.exists()) { + InputStream is = new FileInputStream(filePdnsd); + streamToFile(is, filePdnsd, false, true); + setExecutable(filePdnsd); + + if (filePdnsd.exists() && filePdnsd.canExecute()) + return filePdnsd; + } + + //let's try another approach + filePdnsd = new File(installFolder, LIB_NAME); + //fileTor = NativeLoader.initNativeLibs(context,fileTor); + CustomNativeLoader.initNativeLibs(context,filePdnsd); + + setExecutable(filePdnsd); + + if (filePdnsd != null && filePdnsd.exists() && filePdnsd.canExecute()) + return filePdnsd; + + return null; + } + + + // Return Full path to the directory where native JNI libraries are stored. + private static String getNativeLibraryDir(Context context) { + ApplicationInfo appInfo = context.getApplicationInfo(); + return appInfo.nativeLibraryDir; + } + + + + + + + /* + * Reads file from assetPath/assetKey writes it to the install folder + */ + private File assetToFile(String assetPath, String assetKey, boolean isZipped, boolean isExecutable) throws IOException { + InputStream is = context.getAssets().open(assetPath); + File outFile = new File(installFolder, assetKey); + streamToFile(is, outFile, false, isZipped); + if (isExecutable) { + setExecutable(outFile); + } + return outFile; + } + + + /* + * Write the inputstream contents to the file + */ + private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException + + { + byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; + + int bytecount; + + OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append); + ZipInputStream zis = null; + + if (zip) + { + zis = new ZipInputStream(stm); + ZipEntry ze = zis.getNextEntry(); + stm = zis; + + } + + while ((bytecount = stm.read(buffer)) > 0) + { + + stmOut.write(buffer, 0, bytecount); + + } + + stmOut.close(); + stm.close(); + + if (zis != null) + zis.close(); + + + return true; + + } + + + + private void setExecutable(File fileBin) { + fileBin.setReadable(true); + fileBin.setExecutable(true); + fileBin.setWritable(false); + fileBin.setWritable(true, true); + } + + private static File[] listf(String directoryName) { + + // .............list file + File directory = new File(directoryName); + + // get all the files from a directory + File[] fList = directory.listFiles(); + + if (fList != null) + for (File file : fList) { + if (file.isFile()) { + Log.d(TAG,file.getAbsolutePath()); + } else if (file.isDirectory()) { + listf(file.getAbsolutePath()); + } + } + + return fList; + } + + +} diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java index 34d89b49..b02fd71a 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java @@ -4,6 +4,9 @@ import android.app.Service; import android.content.Intent; import android.net.VpnService; +import java.io.IOException; +import java.util.concurrent.TimeoutException; + /** * Created by n8fr8 on 9/26/16. */ @@ -13,7 +16,13 @@ public class TorVpnService extends VpnService { @Override public void onCreate() { super.onCreate(); - mVpnManager = new OrbotVpnManager(this); + try { + mVpnManager = new OrbotVpnManager(this); + } catch (IOException e) { + e.printStackTrace(); + } catch (TimeoutException e) { + e.printStackTrace(); + } } /* (non-Javadoc) diff --git a/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so b/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so new file mode 100755 index 00000000..8aaedda7 Binary files /dev/null and b/orbotservice/src/main/libs/arm64-v8a/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/arm64-v8a/pdnsd.so b/orbotservice/src/main/libs/arm64-v8a/pdnsd.so new file mode 100755 index 00000000..1bc4487d Binary files /dev/null and b/orbotservice/src/main/libs/arm64-v8a/pdnsd.so differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so b/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so new file mode 100755 index 00000000..74b86bdf Binary files /dev/null and b/orbotservice/src/main/libs/armeabi-v7a/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so b/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so new file mode 100755 index 00000000..573b5e42 Binary files /dev/null and b/orbotservice/src/main/libs/armeabi-v7a/pdnsd.so differ diff --git a/orbotservice/src/main/libs/armeabi/libtun2socks.so b/orbotservice/src/main/libs/armeabi/libtun2socks.so new file mode 100755 index 00000000..55ef663a Binary files /dev/null and b/orbotservice/src/main/libs/armeabi/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/armeabi/pdnsd.so b/orbotservice/src/main/libs/armeabi/pdnsd.so new file mode 100755 index 00000000..95a5269d Binary files /dev/null and b/orbotservice/src/main/libs/armeabi/pdnsd.so differ diff --git a/orbotservice/src/main/libs/x86/libtun2socks.so b/orbotservice/src/main/libs/x86/libtun2socks.so new file mode 100755 index 00000000..af9a3ccc Binary files /dev/null and b/orbotservice/src/main/libs/x86/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/x86/pdnsd.so b/orbotservice/src/main/libs/x86/pdnsd.so new file mode 100755 index 00000000..c078cc38 Binary files /dev/null and b/orbotservice/src/main/libs/x86/pdnsd.so differ diff --git a/orbotservice/src/main/libs/x86_64/libtun2socks.so b/orbotservice/src/main/libs/x86_64/libtun2socks.so new file mode 100755 index 00000000..8861e585 Binary files /dev/null and b/orbotservice/src/main/libs/x86_64/libtun2socks.so differ diff --git a/orbotservice/src/main/libs/x86_64/pdnsd.so b/orbotservice/src/main/libs/x86_64/pdnsd.so new file mode 100755 index 00000000..68721cc2 Binary files /dev/null and b/orbotservice/src/main/libs/x86_64/pdnsd.so differ

1 0