commit 26b91993784aad1f5811e9da20c7a385fbf8d987 Merge: d937b9b 5000754 Author: Nathan Freitas nathan@freitas.net Date: Fri Jan 13 22:19:02 2017 -0500

Merge branch 'hidden_services' of https://github.com/arrase/orbot into arrase-hidden_services

app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 239 ++++++----- .../org/torproject/android/OrbotMainActivity.java | 448 +++++++++++++-------- .../android/settings/SettingsPreferences.java | 20 +- .../ui/hiddenservices/ClientCookiesActivity.java | 199 +++++++++ .../ui/hiddenservices/HiddenServicesActivity.java | 214 ++++++++++ .../ui/hiddenservices/adapters/BackupAdapter.java | 50 +++ .../adapters/ClientCookiesAdapter.java | 64 +++ .../hiddenservices/adapters/OnionListAdapter.java | 68 ++++ .../ui/hiddenservices/backup/BackupUtils.java | 336 ++++++++++++++++ .../android/ui/hiddenservices/backup/ZipIt.java | 101 +++++ .../ui/hiddenservices/database/HSDatabase.java | 47 +++ .../ui/hiddenservices/dialogs/AddCookieDialog.java | 84 ++++ .../dialogs/CookieActionsDialog.java | 95 +++++ .../hiddenservices/dialogs/CookieDeleteDialog.java | 50 +++ .../ui/hiddenservices/dialogs/HSActionsDialog.java | 130 ++++++ .../ui/hiddenservices/dialogs/HSCookieDialog.java | 81 ++++ .../ui/hiddenservices/dialogs/HSDataDialog.java | 102 +++++ .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 65 +++ .../dialogs/SelectCookieBackupDialog.java | 84 ++++ .../dialogs/SelectHSBackupDialog.java | 84 ++++ .../permissions/PermissionManager.java | 103 +++++ .../providers/CookieContentProvider.java | 134 ++++++ .../providers/HSContentProvider.java | 144 +++++++ .../ui/hiddenservices/storage/ExternalStorage.java | 34 ++ .../res/layout/layout_activity_client_cookies.xml | 35 ++ .../res/layout/layout_add_client_cookie_dialog.xml | 64 +++ .../res/layout/layout_client_cookie_list_item.xml | 24 ++ .../res/layout/layout_content_client_cookies.xml | 21 + 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 | 12 + .../res/layout/layout_hs_backups_list_item.xml | 25 ++ app/src/main/res/layout/layout_hs_cookie.xml | 31 ++ app/src/main/res/layout/layout_hs_data_dialog.xml | 87 ++++ app/src/main/res/layout/layout_hs_list_item.xml | 59 +++ app/src/main/res/layout/layout_hs_list_view.xml | 33 ++ .../main/res/layout/layout_hs_list_view_main.xml | 20 + app/src/main/res/menu/cookie_menu.xml | 11 + app/src/main/res/menu/hs_menu.xml | 14 + app/src/main/res/menu/orbot_main.xml | 18 +- app/src/main/res/values-es/arrays.xml | 16 + app/src/main/res/values-es/strings.xml | 32 ++ app/src/main/res/values-v21/styles.xml | 1 + app/src/main/res/values-w820dp/dimens.xml | 6 + app/src/main/res/values/arrays.xml | 5 +- app/src/main/res/values/dimens.xml | 22 +- app/src/main/res/values/strings.xml | 142 ++++--- app/src/main/res/values/styles.xml | 6 + app/src/main/res/xml/hidden_services_paths.xml | 4 + app/src/main/res/xml/preferences.xml | 11 - .../org/torproject/android/service/TorService.java | 256 +++++++----- .../android/service/TorServiceConstants.java | 2 + 53 files changed, 3517 insertions(+), 478 deletions(-)