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

[n8fr8@xxxxxxxxxxxxxx]

commit 75bebd89726033ba6322deb38e6ea1decd522f36
Merge: 2fb2ed69 ecb5a930
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Feb 4 16:40:04 2021 -0500

    Merge branch 'bitmold-v3onions'

 app/src/main/AndroidManifest.xml                   |  33 +-
 .../java/org/torproject/android/MainConstants.java |  15 -
 .../org/torproject/android/OrbotMainActivity.java  | 153 ++++---
 .../ui/hiddenservices/ClientCookiesActivity.java   |  12 +-
 .../ui/hiddenservices/HiddenServicesActivity.java  |  24 +-
 .../hiddenservices/adapters/OnionListAdapter.java  |   7 +-
 .../ui/hiddenservices/backup/BackupUtils.java      | 175 +++++++-
 .../backup/{ZipIt.java => ZipUtilities.java}       |  14 +-
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |   6 +-
 .../dialogs/CookieActionsDialog.java               |   2 +-
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |   4 +-
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |   6 +-
 .../permissions/PermissionManager.java             |  14 +-
 .../providers/HSContentProvider.java               |   6 +-
 .../ui/onboarding/CustomBridgesActivity.java       |   6 +-
 .../OnionServiceActionsDialogFragment.java         |  94 ++++
 .../ui/v3onionservice/OnionServiceActivity.java    | 178 ++++++++
 .../OnionServiceContentProvider.java               | 110 +++++
 .../OnionServiceCreateDialogFragment.java          |  98 +++++
 .../ui/v3onionservice/OnionServiceDatabase.java    |  37 ++
 .../OnionServiceDeleteDialogFragment.java          |  40 ++
 .../ui/v3onionservice/OnionV3ListAdapter.java      |  53 +++
 .../ClientAuthActionsDialogFragment.java           |  42 ++
 .../clientauth/ClientAuthActivity.java             | 142 ++++++
 .../clientauth/ClientAuthBackupDialogFragment.java |  90 ++++
 .../clientauth/ClientAuthContentProvider.java      | 104 +++++
 .../clientauth/ClientAuthCreateDialogFragment.java |  95 ++++
 .../clientauth/ClientAuthDatabase.java             |  30 ++
 .../clientauth/ClientAuthDeleteDialogFragment.java |  36 ++
 .../clientauth/ClientAuthListAdapter.java          |  49 +++
 app/src/main/res/layout/activity_v3auth.xml        |  45 ++
 .../main/res/layout/dialog_add_v3_client_auth.xml  |  34 ++
 app/src/main/res/menu/orbot_main.xml               | 137 +++---
 app/src/main/res/values/dimens.xml                 |   1 +
 app/src/main/res/values/strings.xml                |  18 +-
 .../java/org/torproject/android/core/DiskUtils.kt  |  11 +-
 .../torproject/android/service/OrbotService.java   | 486 +++++++++------------
 .../android/service/TorServiceConstants.java       |   3 +-
 38 files changed, 1884 insertions(+), 526 deletions(-)



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