[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [orbot/master] Merge branch 'no_v2_onions'

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [orbot/master] Merge branch 'no_v2_onions'
From: n8fr8@xxxxxxxxxxxxxx
Date: Wed, 22 Dec 2021 21:55:10 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 22 Dec 2021 17:07:13 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>
commit 0b1e7be203f30c5f3d99abfb018f34b99873d80a
Merge: 2d1455ef d119de00
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Oct 26 09:04:06 2021 -0400

    Merge branch 'no_v2_onions'

 app-mini/src/main/res/values-ar/strings.xml        |  13 +-
 app-mini/src/main/res/values-ay/strings.xml        |  13 +-
 app-mini/src/main/res/values-az/strings.xml        |   3 +-
 app-mini/src/main/res/values-be/strings.xml        |  13 +-
 app-mini/src/main/res/values-bg/strings.xml        |   6 +-
 app-mini/src/main/res/values-ca/strings.xml        |  13 +-
 app-mini/src/main/res/values-cs-rCZ/strings.xml    |   3 +-
 app-mini/src/main/res/values-cs/strings.xml        |   3 +-
 app-mini/src/main/res/values-cy/strings.xml        |   3 +-
 app-mini/src/main/res/values-da/strings.xml        |   6 +-
 app-mini/src/main/res/values-de/strings.xml        |  13 +-
 app-mini/src/main/res/values-el/strings.xml        |  13 +-
 app-mini/src/main/res/values-eo/strings.xml        |   3 +-
 app-mini/src/main/res/values-es/strings.xml        |  13 +-
 app-mini/src/main/res/values-et/strings.xml        |   3 +-
 app-mini/src/main/res/values-eu/strings.xml        |  13 +-
 app-mini/src/main/res/values-fa/strings.xml        |  13 +-
 app-mini/src/main/res/values-fi/strings.xml        |   6 +-
 app-mini/src/main/res/values-fr-rFR/strings.xml    |   3 +-
 app-mini/src/main/res/values-fr/strings.xml        |  13 +-
 app-mini/src/main/res/values-gl/strings.xml        |  13 +-
 app-mini/src/main/res/values-hi/strings.xml        |  13 +-
 app-mini/src/main/res/values-hr/strings.xml        |   3 +-
 app-mini/src/main/res/values-hu/strings.xml        |  13 +-
 app-mini/src/main/res/values-in/strings.xml        |   3 +-
 app-mini/src/main/res/values-is/strings.xml        |  13 +-
 app-mini/src/main/res/values-it/strings.xml        |  13 +-
 app-mini/src/main/res/values-iw/strings.xml        |   3 +-
 app-mini/src/main/res/values-ja/strings.xml        |  13 +-
 app-mini/src/main/res/values-ko/strings.xml        |   3 +-
 app-mini/src/main/res/values-lv/strings.xml        |   6 +-
 app-mini/src/main/res/values-mk/strings.xml        |  13 +-
 app-mini/src/main/res/values-ms-rMY/strings.xml    |   6 +-
 app-mini/src/main/res/values-ms/strings.xml        |   3 +-
 app-mini/src/main/res/values-my/strings.xml        |   3 +-
 app-mini/src/main/res/values-nb/strings.xml        |  13 +-
 app-mini/src/main/res/values-nl/strings.xml        |  13 +-
 app-mini/src/main/res/values-pl/strings.xml        |   6 +-
 app-mini/src/main/res/values-pt-rBR/strings.xml    |   8 +-
 app-mini/src/main/res/values-pt/strings.xml        |   6 +-
 app-mini/src/main/res/values-ro/strings.xml        |   6 +-
 app-mini/src/main/res/values-ru/strings.xml        |  13 +-
 app-mini/src/main/res/values-si-rLK/strings.xml    |   6 +-
 app-mini/src/main/res/values-sk/strings.xml        |   3 +-
 app-mini/src/main/res/values-sr/strings.xml        |  13 +-
 app-mini/src/main/res/values-sv/strings.xml        |  13 +-
 app-mini/src/main/res/values-ta/strings.xml        |   6 +-
 app-mini/src/main/res/values-th/strings.xml        |  13 +-
 app-mini/src/main/res/values-tl/strings.xml        |   3 +-
 app-mini/src/main/res/values-tr/strings.xml        |  13 +-
 app-mini/src/main/res/values-uk/strings.xml        |  13 +-
 app-mini/src/main/res/values-vi/strings.xml        |   3 +-
 app-mini/src/main/res/values-zh-rCN/strings.xml    |   3 +-
 app-mini/src/main/res/values-zh-rTW/strings.xml    |  13 +-
 app-mini/src/main/res/values/strings.xml           |  11 -
 app-tv/src/main/res/values-ar/strings.xml          |  13 +-
 app-tv/src/main/res/values-ay/strings.xml          |  13 +-
 app-tv/src/main/res/values-az/strings.xml          |   3 +-
 app-tv/src/main/res/values-be/strings.xml          |  13 +-
 app-tv/src/main/res/values-bg/strings.xml          |   6 +-
 app-tv/src/main/res/values-ca/strings.xml          |  13 +-
 app-tv/src/main/res/values-cs-rCZ/strings.xml      |   3 +-
 app-tv/src/main/res/values-cs/strings.xml          |   3 +-
 app-tv/src/main/res/values-cy/strings.xml          |   3 +-
 app-tv/src/main/res/values-da/strings.xml          |   6 +-
 app-tv/src/main/res/values-de/strings.xml          |  13 +-
 app-tv/src/main/res/values-el/strings.xml          |  13 +-
 app-tv/src/main/res/values-eo/strings.xml          |   3 +-
 app-tv/src/main/res/values-es/strings.xml          |  13 +-
 app-tv/src/main/res/values-et/strings.xml          |   3 +-
 app-tv/src/main/res/values-eu/strings.xml          |  13 +-
 app-tv/src/main/res/values-fa/strings.xml          |  13 +-
 app-tv/src/main/res/values-fi/strings.xml          |   6 +-
 app-tv/src/main/res/values-fr-rFR/strings.xml      |   3 +-
 app-tv/src/main/res/values-fr/strings.xml          |  13 +-
 app-tv/src/main/res/values-gl/strings.xml          |  13 +-
 app-tv/src/main/res/values-hi/strings.xml          |  13 +-
 app-tv/src/main/res/values-hr/strings.xml          |   3 +-
 app-tv/src/main/res/values-hu/strings.xml          |  13 +-
 app-tv/src/main/res/values-in/strings.xml          |   3 +-
 app-tv/src/main/res/values-is/strings.xml          |  13 +-
 app-tv/src/main/res/values-it/strings.xml          |  13 +-
 app-tv/src/main/res/values-iw/strings.xml          |   3 +-
 app-tv/src/main/res/values-ja/strings.xml          |  13 +-
 app-tv/src/main/res/values-ko/strings.xml          |   3 +-
 app-tv/src/main/res/values-lv/strings.xml          |   6 +-
 app-tv/src/main/res/values-mk/strings.xml          |  13 +-
 app-tv/src/main/res/values-ms-rMY/strings.xml      |   6 +-
 app-tv/src/main/res/values-ms/strings.xml          |   3 +-
 app-tv/src/main/res/values-my/strings.xml          |   3 +-
 app-tv/src/main/res/values-nb/strings.xml          |  13 +-
 app-tv/src/main/res/values-nl/strings.xml          |  13 +-
 app-tv/src/main/res/values-pl/strings.xml          |   6 +-
 app-tv/src/main/res/values-pt-rBR/strings.xml      |   8 +-
 app-tv/src/main/res/values-pt/strings.xml          |   6 +-
 app-tv/src/main/res/values-ro/strings.xml          |   6 +-
 app-tv/src/main/res/values-ru/strings.xml          |  13 +-
 app-tv/src/main/res/values-si-rLK/strings.xml      |   6 +-
 app-tv/src/main/res/values-sk/strings.xml          |   3 +-
 app-tv/src/main/res/values-sr/strings.xml          |  13 +-
 app-tv/src/main/res/values-sv/strings.xml          |  13 +-
 app-tv/src/main/res/values-ta/strings.xml          |   6 +-
 app-tv/src/main/res/values-th/strings.xml          |  13 +-
 app-tv/src/main/res/values-tl/strings.xml          |   3 +-
 app-tv/src/main/res/values-tr/strings.xml          |  13 +-
 app-tv/src/main/res/values-uk/strings.xml          |  13 +-
 app-tv/src/main/res/values-vi/strings.xml          |   3 +-
 app-tv/src/main/res/values-zh-rCN/strings.xml      |   3 +-
 app-tv/src/main/res/values-zh-rTW/strings.xml      |  13 +-
 app-tv/src/main/res/values/strings.xml             |  11 -
 app/src/main/AndroidManifest.xml                   |  28 --
 .../main/java/org/torproject/android/OrbotApp.java |   3 +
 .../org/torproject/android/OrbotMainActivity.java  | 179 +---------
 .../ui/hiddenservices/ClientCookiesActivity.java   | 175 ----------
 .../ui/hiddenservices/HiddenServicesActivity.java  | 194 -----------
 .../adapters/ClientCookiesAdapter.java             |  52 ---
 .../hiddenservices/adapters/OnionListAdapter.java  |  59 ----
 .../ui/hiddenservices/backup/BackupUtils.java      | 388 ---------------------
 .../ui/hiddenservices/database/HSDatabase.java     |  50 ---
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  95 -----
 .../dialogs/CookieActionsDialog.java               | 119 -------
 .../hiddenservices/dialogs/CookieDeleteDialog.java |  37 --
 .../ui/hiddenservices/dialogs/HSActionsDialog.java | 117 -------
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |  57 ---
 .../ui/hiddenservices/dialogs/HSDataDialog.java    | 106 ------
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |  46 ---
 .../providers/CookieContentProvider.java           | 133 -------
 .../providers/HSContentProvider.java               | 143 --------
 .../android/ui/onboarding/OnboardingActivity.java  |   2 +-
 .../OnionServiceActionsDialogFragment.java         |   5 +-
 .../ui/v3onionservice/OnionServiceActivity.java    |   7 +-
 .../PermissionManager.java                         |   2 +-
 .../android/ui/v3onionservice/V3BackupUtils.java   | 188 ++++++++++
 .../backup => v3onionservice}/ZipUtilities.java    |   3 +-
 .../clientauth/ClientAuthActivity.java             |   6 +-
 .../clientauth/ClientAuthBackupDialogFragment.java |   6 +-
 .../res/layout/layout_activity_client_cookies.xml  |  36 --
 .../res/layout/layout_add_client_cookie_dialog.xml |  33 --
 .../res/layout/layout_content_client_cookies.xml   |  20 --
 app/src/main/res/menu/cookie_menu.xml              |  10 -
 app/src/main/res/menu/orbot_main.xml               |  15 -
 app/src/main/res/values-ar/strings.xml             |  11 -
 app/src/main/res/values-ay/strings.xml             |  13 +-
 app/src/main/res/values-az/strings.xml             |   3 +-
 app/src/main/res/values-be/strings.xml             |  13 +-
 app/src/main/res/values-bg/strings.xml             |   6 +-
 app/src/main/res/values-ca/strings.xml             |  11 -
 app/src/main/res/values-cs-rCZ/strings.xml         |   1 -
 app/src/main/res/values-cs/strings.xml             |   3 +-
 app/src/main/res/values-cy/strings.xml             |   3 +-
 app/src/main/res/values-da/strings.xml             |   6 +-
 app/src/main/res/values-de/strings.xml             |  12 -
 app/src/main/res/values-el/strings.xml             |  11 -
 app/src/main/res/values-eo/strings.xml             |   3 +-
 app/src/main/res/values-es/strings.xml             |  11 -
 app/src/main/res/values-et/strings.xml             |   3 +-
 app/src/main/res/values-eu/strings.xml             |  11 -
 app/src/main/res/values-fa/strings.xml             |  11 -
 app/src/main/res/values-fi/strings.xml             |   5 -
 app/src/main/res/values-fr-rFR/strings.xml         |  12 -
 app/src/main/res/values-fr/strings.xml             |  13 +-
 app/src/main/res/values-gl/strings.xml             |  11 -
 app/src/main/res/values-hi/strings.xml             |  11 -
 app/src/main/res/values-hr/strings.xml             |   3 +-
 app/src/main/res/values-hu/strings.xml             |  11 -
 app/src/main/res/values-in/strings.xml             |   2 -
 app/src/main/res/values-is/strings.xml             |  12 -
 app/src/main/res/values-it/strings.xml             |  11 -
 app/src/main/res/values-iw/strings.xml             |   1 -
 app/src/main/res/values-ja/strings.xml             |  11 -
 app/src/main/res/values-ko/strings.xml             |   3 +-
 app/src/main/res/values-lt-rLT/strings.xml         |  12 -
 app/src/main/res/values-lv/strings.xml             |   6 +-
 app/src/main/res/values-mk/strings.xml             |  11 -
 app/src/main/res/values-ms-rMY/strings.xml         |   2 -
 app/src/main/res/values-ms/strings.xml             |   3 +-
 app/src/main/res/values-my/strings.xml             |   3 +-
 app/src/main/res/values-nb/strings.xml             |  11 -
 app/src/main/res/values-nl/strings.xml             |  11 -
 app/src/main/res/values-pl/strings.xml             |  11 -
 app/src/main/res/values-pt-rBR/strings.xml         |  12 -
 app/src/main/res/values-pt-rPT/strings.xml         |  12 -
 app/src/main/res/values-pt/strings.xml             |  12 -
 app/src/main/res/values-ro-rRO/strings.xml         |  12 -
 app/src/main/res/values-ro/strings.xml             |   6 +-
 app/src/main/res/values-ru/strings.xml             |  12 -
 app/src/main/res/values-si-rLK/strings.xml         |   2 -
 app/src/main/res/values-sk/strings.xml             |   3 +-
 app/src/main/res/values-sr/strings.xml             |  13 +-
 app/src/main/res/values-sv/strings.xml             |  11 -
 app/src/main/res/values-ta/strings.xml             |   6 +-
 app/src/main/res/values-th/strings.xml             |  11 -
 app/src/main/res/values-tl/strings.xml             |   3 +-
 app/src/main/res/values-tr/strings.xml             |  12 -
 app/src/main/res/values-uk/strings.xml             |  12 -
 app/src/main/res/values-vi/strings.xml             |  12 -
 app/src/main/res/values-zh-rCN/strings.xml         |  12 -
 app/src/main/res/values-zh-rTW/strings.xml         |  13 +-
 app/src/main/res/values/strings.xml                |  12 -
 .../torproject/android/service/OrbotService.java   | 175 +---------
 orbotservice/src/main/res/values-ar/strings.xml    |   3 +-
 orbotservice/src/main/res/values-az/strings.xml    |   3 +-
 orbotservice/src/main/res/values-bg/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ca/strings.xml    |   3 +-
 .../src/main/res/values-cs-rCZ/strings.xml         |   3 +-
 orbotservice/src/main/res/values-da/strings.xml    |   3 +-
 orbotservice/src/main/res/values-de/strings.xml    |   3 +-
 orbotservice/src/main/res/values-el/strings.xml    |   3 +-
 orbotservice/src/main/res/values-eo/strings.xml    |   3 +-
 orbotservice/src/main/res/values-es/strings.xml    |   3 +-
 orbotservice/src/main/res/values-et/strings.xml    |   3 +-
 orbotservice/src/main/res/values-eu/strings.xml    |   3 +-
 orbotservice/src/main/res/values-fa/strings.xml    |   3 +-
 orbotservice/src/main/res/values-fi/strings.xml    |   3 +-
 .../src/main/res/values-fr-rFR/strings.xml         |   3 +-
 orbotservice/src/main/res/values-gl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-hr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-hu/strings.xml    |   3 +-
 orbotservice/src/main/res/values-in/strings.xml    |   3 +-
 orbotservice/src/main/res/values-is/strings.xml    |   3 +-
 orbotservice/src/main/res/values-it/strings.xml    |   3 +-
 orbotservice/src/main/res/values-iw/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ja/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ko/strings.xml    |   3 +-
 orbotservice/src/main/res/values-lv/strings.xml    |   3 +-
 orbotservice/src/main/res/values-mk/strings.xml    |   3 +-
 .../src/main/res/values-ms-rMY/strings.xml         |   3 +-
 orbotservice/src/main/res/values-ms/strings.xml    |   3 +-
 orbotservice/src/main/res/values-nb/strings.xml    |   3 +-
 orbotservice/src/main/res/values-nl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-pl/strings.xml    |   3 +-
 .../src/main/res/values-pt-rBR/strings.xml         |   3 +-
 orbotservice/src/main/res/values-pt/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ro/strings.xml    |   3 +-
 orbotservice/src/main/res/values-ru/strings.xml    |   3 +-
 .../src/main/res/values-si-rLK/strings.xml         |   3 +-
 orbotservice/src/main/res/values-sr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-sv/strings.xml    |   3 +-
 orbotservice/src/main/res/values-th/strings.xml    |   3 +-
 orbotservice/src/main/res/values-tl/strings.xml    |   3 +-
 orbotservice/src/main/res/values-tr/strings.xml    |   3 +-
 orbotservice/src/main/res/values-uk/strings.xml    |   3 +-
 orbotservice/src/main/res/values-vi/strings.xml    |   3 +-
 .../src/main/res/values-zh-rCN/strings.xml         |   3 +-
 orbotservice/src/main/res/values/strings.xml       |   1 -
 245 files changed, 420 insertions(+), 3634 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [orbot/master] Translated using Weblate (Portuguese (Brazil))
Next by Author: [tor-commits] [orbot/master] Merge pull request #466 from syphyr/main
Previous by thread: [tor-commits] [orbot/master] stop warning us about jcenter...we know already!
Next by thread: [tor-commits] [orbot/master] Merge pull request #529 from syphyr/main
Index(es):
- Author
- Thread