[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] Merge branch 'bitmold-backup_fix'



commit a66b99dd6cfa526d76296b765eac9e5acfd6b3fe
Merge: e7d9a8a1 929407d4
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Wed Oct 7 08:13:30 2020 -0400

    Merge branch 'bitmold-backup_fix'

 LICENSE                                            |   20 +-
 app-mini/src/main/res/values-ar/strings.xml        |   26 +-
 app-mini/src/main/res/values-ay/strings.xml        |   29 +-
 app-mini/src/main/res/values-az/strings.xml        |   19 +-
 app-mini/src/main/res/values-be/strings.xml        |   29 +-
 app-mini/src/main/res/values-bg/strings.xml        |   19 +-
 app-mini/src/main/res/values-bn-rBD/strings.xml    |    5 +-
 app-mini/src/main/res/values-bn-rIN/strings.xml    |    3 +-
 app-mini/src/main/res/values-bn/strings.xml        |    3 +-
 app-mini/src/main/res/values-brx/strings.xml       |    3 +-
 app-mini/src/main/res/values-bs/strings.xml        |    3 +-
 app-mini/src/main/res/values-ca/strings.xml        |   31 +-
 app-mini/src/main/res/values-cs-rCZ/strings.xml    |   19 +-
 app-mini/src/main/res/values-cs/strings.xml        |    5 +-
 app-mini/src/main/res/values-cy/strings.xml        |    5 +-
 app-mini/src/main/res/values-da/strings.xml        |    6 +-
 app-mini/src/main/res/values-de/strings.xml        |   31 +-
 app-mini/src/main/res/values-el/strings.xml        |   31 +-
 app-mini/src/main/res/values-en-rGB/strings.xml    |    5 +-
 app-mini/src/main/res/values-eo/strings.xml        |    5 +-
 app-mini/src/main/res/values-es-rAR/strings.xml    |    8 +-
 app-mini/src/main/res/values-es/arrays.xml         |    4 -
 app-mini/src/main/res/values-es/strings.xml        |   31 +-
 app-mini/src/main/res/values-et/strings.xml        |    9 +-
 app-mini/src/main/res/values-eu/strings.xml        |   31 +-
 app-mini/src/main/res/values-fa/strings.xml        |   31 +-
 app-mini/src/main/res/values-fi/strings.xml        |   15 +-
 app-mini/src/main/res/values-fr-rFR/strings.xml    |   19 +-
 app-mini/src/main/res/values-fr/strings.xml        |   31 +-
 app-mini/src/main/res/values-gl/strings.xml        |   31 +-
 app-mini/src/main/res/values-gu-rIN/strings.xml    |    3 +-
 app-mini/src/main/res/values-gu/strings.xml        |    3 +-
 app-mini/src/main/res/values-he/strings.xml        |   31 +-
 app-mini/src/main/res/values-hi/strings.xml        |   31 +-
 app-mini/src/main/res/values-hr-rHR/strings.xml    |    3 +-
 app-mini/src/main/res/values-hr/strings.xml        |   15 +-
 app-mini/src/main/res/values-hu/strings.xml        |   31 +-
 app-mini/src/main/res/values-hy-rAM/strings.xml    |    3 +-
 app-mini/src/main/res/values-ia/strings.xml        |    3 +-
 app-mini/src/main/res/values-id/strings.xml        |   19 +-
 app-mini/src/main/res/values-in-rID/strings.xml    |   19 +-
 app-mini/src/main/res/values-in/strings.xml        |    3 +-
 app-mini/src/main/res/values-is/strings.xml        |   31 +-
 app-mini/src/main/res/values-it/strings.xml        |   31 +-
 app-mini/src/main/res/values-iw/strings.xml        |   13 +-
 app-mini/src/main/res/values-ja/strings.xml        |   31 +-
 app-mini/src/main/res/values-kn/strings.xml        |    3 +-
 app-mini/src/main/res/values-ko/strings.xml        |   19 +-
 app-mini/src/main/res/values-ky/strings.xml        |    3 +-
 app-mini/src/main/res/values-lt/strings.xml        |    5 +-
 app-mini/src/main/res/values-lv/strings.xml        |   19 +-
 app-mini/src/main/res/values-mk/strings.xml        |   29 +-
 app-mini/src/main/res/values-ml/strings.xml        |    3 +-
 app-mini/src/main/res/values-mn/strings.xml        |    3 +-
 app-mini/src/main/res/values-ms-rMY/strings.xml    |    5 +-
 app-mini/src/main/res/values-ms/strings.xml        |    5 +-
 app-mini/src/main/res/values-my/strings.xml        |    3 +-
 app-mini/src/main/res/values-nb/strings.xml        |   26 +-
 app-mini/src/main/res/values-nl/strings.xml        |   31 +-
 app-mini/src/main/res/values-pa/strings.xml        |    3 +-
 app-mini/src/main/res/values-pl/strings.xml        |   22 +-
 app-mini/src/main/res/values-ps/strings.xml        |    3 +-
 app-mini/src/main/res/values-pt-rBR/strings.xml    |   28 +-
 app-mini/src/main/res/values-pt-rPT/strings.xml    |    8 +-
 app-mini/src/main/res/values-pt/strings.xml        |   10 +-
 app-mini/src/main/res/values-ro-rRO/strings.xml    |    3 +-
 app-mini/src/main/res/values-ro/strings.xml        |   19 +-
 app-mini/src/main/res/values-rs-rAR/strings.xml    |    4 +-
 app-mini/src/main/res/values-ru/strings.xml        |   31 +-
 app-mini/src/main/res/values-si-rLK/strings.xml    |    5 +-
 app-mini/src/main/res/values-sk/strings.xml        |   19 +-
 app-mini/src/main/res/values-sl/strings.xml        |    5 +-
 app-mini/src/main/res/values-sn/strings.xml        |    3 +-
 app-mini/src/main/res/values-sq/strings.xml        |    3 +-
 app-mini/src/main/res/values-sr/strings.xml        |   28 +-
 app-mini/src/main/res/values-sv/strings.xml        |   31 +-
 app-mini/src/main/res/values-ta/strings.xml        |    5 +-
 app-mini/src/main/res/values-th/strings.xml        |   31 +-
 app-mini/src/main/res/values-tl/strings.xml        |    9 +-
 app-mini/src/main/res/values-tr/strings.xml        |   29 +-
 app-mini/src/main/res/values-uk/strings.xml        |   31 +-
 app-mini/src/main/res/values-ur/strings.xml        |    3 +-
 app-mini/src/main/res/values-uz/strings.xml        |    3 +-
 app-mini/src/main/res/values-vi/strings.xml        |   19 +-
 app-mini/src/main/res/values-zh-rCN/strings.xml    |   20 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml    |   31 +-
 app-mini/src/main/res/values/arrays.xml            |    4 -
 app-mini/src/main/res/values/strings.xml           |   21 -
 app/src/main/AndroidManifest.xml                   |    8 +-
 .../java/org/torproject/android/MainConstants.java |    2 +-
 .../main/java/org/torproject/android/OrbotApp.java |    2 +-
 .../org/torproject/android/OrbotMainActivity.java  |  314 ++--
 .../torproject/android/ui/AppManagerActivity.java  |   95 +-
 .../android/ui/dialog/AboutDialogFragment.java     |   24 +-
 .../android/ui/dialog/MoatErrorDialogFragment.java |    2 +-
 .../ui/hiddenservices/ClientCookiesActivity.java   |  153 +-
 .../ui/hiddenservices/HiddenServicesActivity.java  |  215 ++-
 .../ui/hiddenservices/adapters/BackupAdapter.java  |   44 -
 .../adapters/ClientCookiesAdapter.java             |   21 +-
 .../hiddenservices/adapters/OnionListAdapter.java  |   25 +-
 .../ui/hiddenservices/backup/BackupUtils.java      |  246 +--
 .../android/ui/hiddenservices/backup/ZipIt.java    |   83 +-
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |   90 +-
 .../dialogs/CookieActionsDialog.java               |  148 +-
 .../hiddenservices/dialogs/CookieDeleteDialog.java |   39 +-
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |  155 +-
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |   82 +-
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |  112 +-
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |   61 +-
 .../dialogs/SelectCookieBackupDialog.java          |   64 -
 .../dialogs/SelectHSBackupDialog.java              |   64 -
 .../permissions/PermissionManager.java             |   39 +-
 .../providers/CookieContentProvider.java           |    4 +-
 .../providers/HSContentProvider.java               |    4 +-
 .../ui/onboarding/BridgeWizardActivity.java        |  154 +-
 .../ui/onboarding/CustomBridgesActivity.java       |   46 +-
 .../android/ui/onboarding/CustomSlideBigText.java  |    7 +-
 .../android/ui/onboarding/MoatActivity.java        |   24 +-
 app/src/main/res/layout/layout_about.xml           |  254 ++--
 .../res/layout/layout_activity_client_cookies.xml  |    5 +-
 .../res/layout/layout_add_client_cookie_dialog.xml |   47 +-
 app/src/main/res/layout/layout_apps.xml            |    1 -
 .../res/layout/layout_client_cookie_list_item.xml  |    5 +-
 app/src/main/res/layout/layout_cookie_actions.xml  |   24 -
 app/src/main/res/layout/layout_hs_actions.xml      |   36 -
 app/src/main/res/layout/layout_hs_backups_list.xml |   11 -
 .../res/layout/layout_hs_backups_list_item.xml     |   24 -
 app/src/main/res/layout/layout_hs_cookie.xml       |   31 -
 app/src/main/res/layout/layout_hs_data_dialog.xml  |   66 +-
 app/src/main/res/layout/layout_hs_list_item.xml    |   78 +-
 app/src/main/res/layout/layout_hs_list_view.xml    |    5 +-
 .../main/res/layout/layout_hs_list_view_main.xml   |   35 +-
 app/src/main/res/layout/layout_main.xml            |   54 +-
 app/src/main/res/menu/cookie_menu.xml              |    3 +-
 app/src/main/res/menu/hs_menu.xml                  |   10 +-
 app/src/main/res/values-ar/strings.xml             |   26 +-
 app/src/main/res/values-ay/strings.xml             |   27 +-
 app/src/main/res/values-az/strings.xml             |   20 +-
 app/src/main/res/values-be/strings.xml             |   27 +-
 app/src/main/res/values-bg/strings.xml             |   20 +-
 app/src/main/res/values-bn-rBD/strings.xml         |    6 +-
 app/src/main/res/values-bn-rIN/strings.xml         |    3 +-
 app/src/main/res/values-bn/strings.xml             |    3 +-
 app/src/main/res/values-brx/strings.xml            |    3 +-
 app/src/main/res/values-bs/strings.xml             |    4 +-
 app/src/main/res/values-ca/strings.xml             |   29 +-
 app/src/main/res/values-cs-rCZ/strings.xml         |   20 +-
 app/src/main/res/values-cs/strings.xml             |    8 +-
 app/src/main/res/values-cy/strings.xml             |    7 +-
 app/src/main/res/values-da/strings.xml             |   10 +-
 app/src/main/res/values-de/strings.xml             |   29 +-
 app/src/main/res/values-el/strings.xml             |   31 +-
 app/src/main/res/values-en-rGB/strings.xml         |    6 +-
 app/src/main/res/values-eo/strings.xml             |    8 +-
 app/src/main/res/values-es-rAR/strings.xml         |   13 +-
 app/src/main/res/values-es/arrays.xml              |    9 -
 app/src/main/res/values-es/strings.xml             |   31 +-
 app/src/main/res/values-et/strings.xml             |   10 +-
 app/src/main/res/values-eu/strings.xml             |   29 +-
 app/src/main/res/values-fa/strings.xml             |   33 +-
 app/src/main/res/values-fi/strings.xml             |   16 +-
 app/src/main/res/values-fr-rFR/strings.xml         |   20 +-
 app/src/main/res/values-fr/strings.xml             |   31 +-
 app/src/main/res/values-gl/strings.xml             |   31 +-
 app/src/main/res/values-gu-rIN/strings.xml         |    3 +-
 app/src/main/res/values-gu/strings.xml             |    3 -
 app/src/main/res/values-he/strings.xml             |   31 +-
 app/src/main/res/values-hi/strings.xml             |   31 +-
 app/src/main/res/values-hr-rHR/strings.xml         |    3 +-
 app/src/main/res/values-hr/strings.xml             |   16 +-
 app/src/main/res/values-hu/strings.xml             |   31 +-
 app/src/main/res/values-hy-rAM/strings.xml         |    3 +-
 app/src/main/res/values-ia/strings.xml             |    3 +-
 app/src/main/res/values-id/strings.xml             |   20 +-
 app/src/main/res/values-in-rID/strings.xml         |   20 +-
 app/src/main/res/values-in/strings.xml             |    3 +-
 app/src/main/res/values-is/strings.xml             |   31 +-
 app/src/main/res/values-it/strings.xml             |   31 +-
 app/src/main/res/values-iw/strings.xml             |   14 +-
 app/src/main/res/values-ja/strings.xml             |   31 +-
 app/src/main/res/values-kn/strings.xml             |    3 +-
 app/src/main/res/values-ko/strings.xml             |   20 +-
 app/src/main/res/values-ky/strings.xml             |    3 +-
 app/src/main/res/values-lt/strings.xml             |    7 +-
 app/src/main/res/values-lv/strings.xml             |   20 +-
 app/src/main/res/values-mk/strings.xml             |   29 +-
 app/src/main/res/values-ml/strings.xml             |    3 +-
 app/src/main/res/values-mn/strings.xml             |    3 +-
 app/src/main/res/values-ms-rMY/strings.xml         |    6 +-
 app/src/main/res/values-ms/strings.xml             |    6 +-
 app/src/main/res/values-my/strings.xml             |    4 +-
 app/src/main/res/values-nb/strings.xml             |   26 +-
 app/src/main/res/values-nl/strings.xml             |   31 +-
 app/src/main/res/values-pa/strings.xml             |    3 +-
 app/src/main/res/values-pl/strings.xml             |   23 +-
 app/src/main/res/values-ps/strings.xml             |    3 +-
 app/src/main/res/values-pt-rBR/strings.xml         |   28 +-
 app/src/main/res/values-pt-rPT/strings.xml         |    9 +-
 app/src/main/res/values-pt/strings.xml             |   13 +-
 app/src/main/res/values-ro-rRO/strings.xml         |    3 +-
 app/src/main/res/values-ro/strings.xml             |   20 +-
 app/src/main/res/values-ru/strings.xml             |   31 +-
 app/src/main/res/values-si-rLK/strings.xml         |    7 +-
 app/src/main/res/values-sk/strings.xml             |   20 +-
 app/src/main/res/values-sl/strings.xml             |    7 +-
 app/src/main/res/values-sn/strings.xml             |    3 +-
 app/src/main/res/values-sq/strings.xml             |    3 -
 app/src/main/res/values-sr/strings.xml             |   28 +-
 app/src/main/res/values-sv/strings.xml             |   31 +-
 app/src/main/res/values-ta/strings.xml             |    7 +-
 app/src/main/res/values-th/strings.xml             |   31 +-
 app/src/main/res/values-tl/strings.xml             |   14 +-
 app/src/main/res/values-tr/strings.xml             |   29 +-
 app/src/main/res/values-uk/strings.xml             |   31 +-
 app/src/main/res/values-ur/strings.xml             |    3 +-
 app/src/main/res/values-uz/strings.xml             |    3 +-
 app/src/main/res/values-vi/strings.xml             |   20 +-
 app/src/main/res/values-zh-rCN/strings.xml         |   21 +-
 app/src/main/res/values-zh-rTW/strings.xml         |   31 +-
 app/src/main/res/values/arrays.xml                 |    9 -
 app/src/main/res/values/ic_launcher_background.xml |    2 -
 app/src/main/res/values/strings.xml                |   26 +-
 app/src/main/res/xml/hidden_services_paths.xml     |    2 +-
 .../org/torproject/android/core/ClipboardUtils.kt  |   17 +
 .../java/org/torproject/android/core/DiskUtils.kt  |   76 +
 .../org/torproject/android/core/ExternalStorage.kt |   15 -
 .../android/core/ui/SettingsPreferencesActivity.kt |   10 +-
 orbotservice/src/main/AndroidManifest.xml          |    2 -
 .../torproject/android/service/OrbotConstants.java |   32 +-
 .../torproject/android/service/OrbotService.java   | 1576 +++++++++-----------
 .../android/service/StartTorReceiver.java          |    2 +-
 .../android/service/TorEventHandler.java           |  137 +-
 .../android/service/TorServiceConstants.java       |    1 -
 .../android/service/util/CustomNativeLoader.java   |   10 +-
 .../android/service/util/CustomShell.java          |   29 +-
 .../service/util/CustomTorResourceInstaller.java   |  164 +-
 .../android/service/util/DummyActivity.java        |   10 +-
 .../android/service/util/ExternalIPFetcher.java    |   30 +-
 .../android/service/util/NativeLoader.java         |   17 +-
 .../android/service/util/PortForwarder.java        |   20 +-
 .../org/torproject/android/service/util/Prefs.java |    1 -
 .../android/service/util/TCPSourceApp.java         |  138 +-
 .../android/service/util/TorServiceUtils.java      |    8 +-
 .../org/torproject/android/service/util/Utils.java |  325 ++--
 .../android/service/vpn/OrbotVpnManager.java       |  534 ++++---
 .../android/service/vpn/TorifiedApp.java           |  465 +++---
 .../torproject/android/service/vpn/Tun2Socks.java  |   87 +-
 .../torproject/android/service/vpn/VpnUtils.java   |   29 +-
 orbotservice/src/main/res/values/colors.xml        |    2 -
 249 files changed, 3468 insertions(+), 6053 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits