tor-commits March 2017

tor-commits@lists.torproject.org

20 participants
1183 discussions

[orbot/master] Write config.json
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 130b89d8461f91ca331c2db50ed0c625e8cc6b2d Author: arrase <arrase(a)gmail.com> Date: Sun Nov 27 17:15:15 2016 +0100 Write config.json --- .../ui/hiddenservices/HiddenServicesActivity.java | 24 +++---- .../ui/hiddenservices/backup/BackupUtils.java | 80 ++++++++++++++++++++-- .../providers/HSContentProvider.java | 25 ++++--- 3 files changed, 99 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java index dc233bb..9de0296 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java @@ -26,16 +26,8 @@ import org.torproject.android.ui.hiddenservices.storage.PermissionManager; public class HiddenServicesActivity extends AppCompatActivity { public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1; - private ContentResolver mCR; + private ContentResolver mResolver; private OnionListAdapter mAdapter; - private Toolbar toolbar; - private String[] mProjection = new String[]{ - HSContentProvider.HiddenService._ID, - HSContentProvider.HiddenService.NAME, - HSContentProvider.HiddenService.PORT, - HSContentProvider.HiddenService.DOMAIN, - HSContentProvider.HiddenService.CREATED_BY_USER - }; private String mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1"; @@ -44,11 +36,11 @@ public class HiddenServicesActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.layout_hs_list_view); - toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - mCR = getContentResolver(); + mResolver = getContentResolver(); FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @@ -61,11 +53,13 @@ public class HiddenServicesActivity extends AppCompatActivity { mAdapter = new OnionListAdapter( this, - mCR.query(HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null), + mResolver.query( + HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null + ), 0 ); - mCR.registerContentObserver( + mResolver.registerContentObserver( HSContentProvider.CONTENT_URI, true, new HSObserver(new Handler()) ); @@ -143,8 +137,8 @@ public class HiddenServicesActivity extends AppCompatActivity { @Override public void onChange(boolean selfChange) { - mAdapter.changeCursor(mCR.query( - HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null + mAdapter.changeCursor(mResolver.query( + HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null )); } } diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index 70da302..07a9600 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -1,18 +1,26 @@ package org.torproject.android.ui.hiddenservices.backup; +import android.content.ContentResolver; import android.content.Context; +import android.database.Cursor; import android.widget.Toast; +import org.json.JSONException; +import org.json.JSONObject; import org.torproject.android.service.R; import org.torproject.android.service.TorServiceConstants; +import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; import org.torproject.android.ui.hiddenservices.storage.ExternalStorage; import java.io.File; +import java.io.FileWriter; import java.io.IOException; public class BackupUtils { private File mHSBasePath; private Context mContext; + private ContentResolver mResolver; + private final String configFileName = "config.json"; public BackupUtils(Context context) { mContext = context; @@ -20,26 +28,86 @@ public class BackupUtils { mContext.getFilesDir().getAbsolutePath(), TorServiceConstants.HIDDEN_SERVICES_DIR ); + + mResolver = mContext.getContentResolver(); } public String createZipBackup(Integer port) { + String configFilePath = mHSBasePath + "/hs" + port + "/" + configFileName; + String hostnameFilePath = mHSBasePath + "/hs" + port + "/hostname"; + String keyFilePath = mHSBasePath + "/hs" + port + "/private_key"; + File storage_path = ExternalStorage.getOrCreateBackupDir(); if (storage_path == null) return null; + Cursor portData = mResolver.query( + HSContentProvider.CONTENT_URI, + HSContentProvider.PROJECTION, + HSContentProvider.HiddenService.PORT + "=" + port, + null, + null + ); + + JSONObject config = new JSONObject(); + try { + if (portData.getCount() != 1) + return null; + + portData.moveToNext(); + + config.put( + HSContentProvider.HiddenService.NAME, + portData.getString(portData.getColumnIndex(HSContentProvider.HiddenService.NAME)) + ); + + config.put( + HSContentProvider.HiddenService.PORT, + portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.PORT)) + ); + + config.put( + HSContentProvider.HiddenService.ONION_PORT, + portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.ONION_PORT)) + ); + + config.put( + HSContentProvider.HiddenService.DOMAIN, + portData.getString(portData.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)) + ); + + config.put( + HSContentProvider.HiddenService.CREATED_BY_USER, + portData.getInt(portData.getColumnIndex(HSContentProvider.HiddenService.CREATED_BY_USER)) + ); + } catch (JSONException e) { + e.printStackTrace(); + return null; + } catch (NullPointerException e) { + e.printStackTrace(); + return null; + } + + try { + FileWriter file = new FileWriter(configFilePath); + file.write(config.toString()); + file.close(); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + + portData.close(); + String zip_path = storage_path.getAbsolutePath() + "/hs" + port + ".zip"; - String files[] = { - mHSBasePath + "/hs" + port + "/hostname", - mHSBasePath + "/hs" + port + "/private_key" - }; + String files[] = {hostnameFilePath, keyFilePath, configFilePath}; ZipIt zip = new ZipIt(files, zip_path); - if (!zip.zip()) { + if (!zip.zip()) return null; - } return zip_path; } diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java index 856c685..2270f5d 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java @@ -19,39 +19,47 @@ public class HSContentProvider extends ContentProvider { private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTH + "/hs"); + + public static final String[] PROJECTION = new String[]{ + HiddenService._ID, + HiddenService.NAME, + HiddenService.PORT, + HiddenService.DOMAIN, + HiddenService.ONION_PORT, + HiddenService.CREATED_BY_USER + }; + //UriMatcher private static final int ONIONS = 1; private static final int ONION_ID = 2; private static final UriMatcher uriMatcher; - //Inicializamos el UriMatcher static { uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); uriMatcher.addURI(AUTH, "hs", ONIONS); uriMatcher.addURI(AUTH, "hs/#", ONION_ID); } - private HSDatabase mServerDB; + private HSDatabase mServervices; private Context mContext; @Override public boolean onCreate() { mContext = getContext(); - mServerDB = new HSDatabase(mContext); + mServervices = new HSDatabase(mContext); return true; } @Nullable @Override public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - //Si es una consulta a un ID concreto construimos el WHERE String where = selection; if (uriMatcher.match(uri) == ONION_ID) { where = "_id=" + uri.getLastPathSegment(); } - SQLiteDatabase db = mServerDB.getReadableDatabase(); + SQLiteDatabase db = mServervices.getReadableDatabase(); return db.query(HSDatabase.HS_DATA_TABLE_NAME, projection, where, selectionArgs, null, null, sortOrder); @@ -77,7 +85,7 @@ public class HSContentProvider extends ContentProvider { public Uri insert(@NonNull Uri uri, ContentValues values) { long regId; - SQLiteDatabase db = mServerDB.getWritableDatabase(); + SQLiteDatabase db = mServervices.getWritableDatabase(); regId = db.insert(HSDatabase.HS_DATA_TABLE_NAME, null, values); @@ -89,13 +97,12 @@ public class HSContentProvider extends ContentProvider { @Override public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) { - //Si es una consulta a un ID concreto construimos el WHERE String where = selection; if (uriMatcher.match(uri) == ONION_ID) { where = "_id=" + uri.getLastPathSegment(); } - SQLiteDatabase db = mServerDB.getWritableDatabase(); + SQLiteDatabase db = mServervices.getWritableDatabase(); Integer rows = db.delete(HSDatabase.HS_DATA_TABLE_NAME, where, selectionArgs); @@ -107,7 +114,7 @@ public class HSContentProvider extends ContentProvider { @Override public int update(@NonNull Uri uri, ContentValues values, String selection, String[] selectionArgs) { - SQLiteDatabase db = mServerDB.getWritableDatabase(); + SQLiteDatabase db = mServervices.getWritableDatabase(); String where = selection; if (uriMatcher.match(uri) == ONION_ID) {

1 0

[orbot/master] bug fix
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 0b21dfc46a0ce15b565844f3ecbdc14cbaf01cad Author: arrase <arrase(a)gmail.com> Date: Wed Nov 23 02:06:38 2016 +0100 bug fix --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2df7eab..c099076 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -151,8 +151,8 @@ android:authorities="org.torproject.android.ui.hs.providers" /> <provider - android:name="com.commonsware.cwac.provider.StreamProvider" - android:authorities="org.torproject.android.backup" + android:name="org.torproject.android.storage.AppDataProvider" + android:authorities="org.torproject.android.storage" android:exported="false" android:grantUriPermissions="true"> <meta-data

1 0

[orbot/master] check empty names
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 17efdcafa29be4304e9f4571b24ddbaf0fc41218 Author: arrase <arrase(a)gmail.com> Date: Thu Nov 24 03:06:40 2016 +0100 check empty names --- .../android/ui/hiddenservices/dialogs/HSDataDialog.java | 9 +++++++-- app/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java index 0b04135..f8ce1fd 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java @@ -42,7 +42,7 @@ public class HSDataDialog extends DialogFragment { ((EditText) dialog_view.findViewById(R.id.hsOnionPort)).getText().toString() ); - if (checkInput(localPort, onionPort)) { + if (checkInput(serverName, localPort, onionPort)) { saveData(serverName, localPort, onionPort); serviceDataDialog.dismiss(); } @@ -59,7 +59,7 @@ public class HSDataDialog extends DialogFragment { return serviceDataDialog; } - private boolean checkInput(Integer local, Integer remote) { + private boolean checkInput(String serverName, Integer local, Integer remote) { boolean is_ok = true; Integer error_msg = 0; @@ -68,6 +68,11 @@ public class HSDataDialog extends DialogFragment { is_ok = false; } + if (serverName == null || serverName.length() < 1) { + error_msg = R.string.name_can_t_be_empty; + is_ok = false; + } + if (!is_ok) { Toast.makeText(getContext(), error_msg, Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3e37d3d..97f2798 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -349,4 +349,5 @@ <string name="permission_denied">Permission denied</string> <string name="restore_backup">Restore Backup</string> <string name="create_a_backup_first">Create a backup first</string> + <string name="name_can_t_be_empty">Name can't be empty</string> </resources>

1 0

[orbot/master] refactor
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 5d3b171e21772615123a4e2109d51f2df57cc1d8 Author: arrase <arrase(a)gmail.com> Date: Sun Nov 27 19:19:44 2016 +0100 refactor --- .../android/ui/hiddenservices/backup/BackupUtils.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index a11cb71..5be10d3 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -118,6 +118,9 @@ public class BackupUtils { } public void restoreZipBackup(File backup) { + + int port; + Cursor service; String backupName = backup.getName(); String hsDir = backupName.substring(0, backupName.lastIndexOf('.')); String configFilePath = mHSBasePath + "/" + hsDir + "/" + configFileName; @@ -149,15 +152,12 @@ public class BackupUtils { try { JSONObject savedValues = new JSONObject(jString); ContentValues fields = new ContentValues(); - int port = savedValues.getInt(HSContentProvider.HiddenService.PORT); fields.put( HSContentProvider.HiddenService.NAME, savedValues.getString(HSContentProvider.HiddenService.NAME) ); - fields.put(HSContentProvider.HiddenService.PORT, port); - fields.put( HSContentProvider.HiddenService.ONION_PORT, savedValues.getInt(HSContentProvider.HiddenService.ONION_PORT) @@ -173,7 +173,10 @@ public class BackupUtils { savedValues.getInt(HSContentProvider.HiddenService.CREATED_BY_USER) ); - Cursor service = mResolver.query( + port = savedValues.getInt(HSContentProvider.HiddenService.PORT); + fields.put(HSContentProvider.HiddenService.PORT, port); + + service = mResolver.query( HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, HSContentProvider.HiddenService.PORT + "=" + port,

1 0

[orbot/master] restore backup dialog
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 872ec4021444a536b484ffc78ee2d8d5a19b0588 Author: arrase <arrase(a)gmail.com> Date: Thu Nov 24 02:22:41 2016 +0100 restore backup dialog --- .../org/torproject/android/backup/BackupUtils.java | 33 ++++++--- .../android/storage/ExternalStorage.java | 30 +++----- .../android/storage/PermissionManager.java | 50 +++++++++++++ .../android/ui/hs/HiddenServicesActivity.java | 11 ++- .../android/ui/hs/adapters/BackupAdapter.java | 50 +++++++++++++ .../android/ui/hs/dialogs/HSActionsDialog.java | 38 ++-------- .../android/ui/hs/dialogs/SelectBackupDialog.java | 81 ++++++++++++++++++++++ app/src/main/res/layout/layout_hs_backups_list.xml | 10 +++ .../res/layout/layout_hs_backups_list_item.xml | 24 +++++++ app/src/main/res/values/strings.xml | 4 +- 10 files changed, 269 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/org/torproject/android/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/backup/BackupUtils.java index e05532f..57d8c8d 100644 --- a/app/src/main/java/org/torproject/android/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/backup/BackupUtils.java @@ -2,17 +2,22 @@ package org.torproject.android.backup; import android.app.Application; import android.content.Context; +import android.widget.Toast; +import org.torproject.android.service.R; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.storage.ExternalStorage; import java.io.File; +import java.io.IOException; public class BackupUtils { private File mHSBasePath; + private Context mContext; public BackupUtils(Context context) { - mHSBasePath = context.getDir( + mContext = context; + mHSBasePath = mContext.getDir( TorServiceConstants.DIRECTORY_TOR_DATA, Application.MODE_PRIVATE ); @@ -20,13 +25,12 @@ public class BackupUtils { public String createZipBackup(Integer port) { - ExternalStorage storage = new ExternalStorage(); - String storage_path = storage.createBackupDir(); - if (storage_path == null) { + File storage_path = ExternalStorage.getOrCreateBackupDir(); + + if (storage_path == null) return null; - } - String zip_path = storage_path + "/hs" + port + ".zip"; + String zip_path = storage_path.getAbsolutePath() + "/hs" + port + ".zip"; String files[] = { mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/hostname", mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/private_key" @@ -42,7 +46,20 @@ public class BackupUtils { } public void restoreZipBackup(Integer port, String path) { - ZipIt zip = new ZipIt(null, path); - zip.unzip(mHSBasePath + "/hs" + port); + String hsBasePath; + + try { + hsBasePath = mHSBasePath.getCanonicalPath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR; + File hsPath = new File(hsBasePath, "/hs" + port); + if (hsPath.mkdirs()) { + ZipIt zip = new ZipIt(null, path); + zip.unzip(hsPath.getCanonicalPath()); + return; + } + } catch (IOException e) { + e.printStackTrace(); + } + + Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/java/org/torproject/android/storage/ExternalStorage.java b/app/src/main/java/org/torproject/android/storage/ExternalStorage.java index 6da650d..bea196e 100644 --- a/app/src/main/java/org/torproject/android/storage/ExternalStorage.java +++ b/app/src/main/java/org/torproject/android/storage/ExternalStorage.java @@ -5,38 +5,30 @@ import android.os.Environment; import java.io.File; public class ExternalStorage { - private final String BACKUPS_DIR = "Orbot-HiddenServices"; + private static final String BACKUPS_DIR = "Orbot-HiddenServices"; - public String createBackupDir() { - if (!isExternalStorageWritable()) { + public static File getOrCreateBackupDir() { + if (!isExternalStorageWritable()) return null; - } - File path = Environment.getExternalStoragePublicDirectory(BACKUPS_DIR); + File dir = new File(Environment.getExternalStorageDirectory(), BACKUPS_DIR); - if (!path.mkdirs()) { + if (!dir.isDirectory() && !dir.mkdirs()) return null; - } - return path.getAbsolutePath(); + return dir; } /* Checks if external storage is available for read and write */ - public boolean isExternalStorageWritable() { + public static boolean isExternalStorageWritable() { String state = Environment.getExternalStorageState(); - if (Environment.MEDIA_MOUNTED.equals(state)) { - return true; - } - return false; + return Environment.MEDIA_MOUNTED.equals(state); } /* Checks if external storage is available to at least read */ - public boolean isExternalStorageReadable() { + public static boolean isExternalStorageReadable() { String state = Environment.getExternalStorageState(); - if (Environment.MEDIA_MOUNTED.equals(state) || - Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) { - return true; - } - return false; + return Environment.MEDIA_MOUNTED.equals(state) || + Environment.MEDIA_MOUNTED_READ_ONLY.equals(state); } } diff --git a/app/src/main/java/org/torproject/android/storage/PermissionManager.java b/app/src/main/java/org/torproject/android/storage/PermissionManager.java new file mode 100644 index 0000000..128db8e --- /dev/null +++ b/app/src/main/java/org/torproject/android/storage/PermissionManager.java @@ -0,0 +1,50 @@ +package org.torproject.android.storage; + + +import android.Manifest; +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.Build; +import android.support.design.widget.Snackbar; +import android.support.v4.app.ActivityCompat; +import android.support.v4.app.FragmentActivity; +import android.view.View; + +import org.torproject.android.R; + +public class PermissionManager { + private static final int PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 1; + + public static boolean usesRuntimePermissions() { + return (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1); + } + + @SuppressLint("NewApi") + public static boolean hasExternalWritePermission(Context context) { + return (context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED); + } + + public static void requestPermissions(FragmentActivity activity) { + final FragmentActivity mActivity = activity; + + if (ActivityCompat.shouldShowRequestPermissionRationale + (mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + Snackbar.make(mActivity.findViewById(android.R.id.content), + R.string.please_grant_permissions_for_external_storage, + Snackbar.LENGTH_INDEFINITE).setAction("ENABLE", + new View.OnClickListener() { + @Override + public void onClick(View v) { + ActivityCompat.requestPermissions(mActivity, + new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, + PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); + } + }).show(); + } else { + ActivityCompat.requestPermissions(mActivity, + new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, + PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); + } + } +} diff --git a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java index 52103dc..4474668 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java @@ -16,9 +16,11 @@ import android.widget.ListView; import android.widget.TextView; import org.torproject.android.R; +import org.torproject.android.storage.PermissionManager; import org.torproject.android.ui.hs.adapters.OnionListAdapter; import org.torproject.android.ui.hs.dialogs.HSActionsDialog; import org.torproject.android.ui.hs.dialogs.HSDataDialog; +import org.torproject.android.ui.hs.dialogs.SelectBackupDialog; import org.torproject.android.ui.hs.providers.HSContentProvider; public class HiddenServicesActivity extends AppCompatActivity { @@ -98,7 +100,14 @@ public class HiddenServicesActivity extends AppCompatActivity { int id = item.getItemId(); if (id == R.id.menu_restore_backup) { - // TODO: Restore backup + if (PermissionManager.usesRuntimePermissions() + && !PermissionManager.hasExternalWritePermission(this)) { + PermissionManager.requestPermissions(this); + return true; + } + + SelectBackupDialog dialog = new SelectBackupDialog(); + dialog.show(getSupportFragmentManager(), "SelectBackupDialog"); return true; } diff --git a/app/src/main/java/org/torproject/android/ui/hs/adapters/BackupAdapter.java b/app/src/main/java/org/torproject/android/ui/hs/adapters/BackupAdapter.java new file mode 100644 index 0000000..bcc7a5a --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/hs/adapters/BackupAdapter.java @@ -0,0 +1,50 @@ +package org.torproject.android.ui.hs.adapters; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +import org.torproject.android.R; + +import java.io.File; +import java.util.List; + +public class BackupAdapter extends ArrayAdapter<File> { + private int mResource; + + public BackupAdapter(Context context, int resource) { + super(context, resource); + mResource = resource; + } + + public BackupAdapter(Context context, int resource, List<File> zips) { + super(context, resource, zips); + mResource = resource; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + + View v = convertView; + + if (v == null) { + LayoutInflater vi; + vi = LayoutInflater.from(getContext()); + v = vi.inflate(mResource, null); + } + + File p = getItem(position); + + if (p != null) { + TextView name = (TextView) v.findViewById(R.id.backup_name); + + if (name != null) + name.setText(p.getName()); + } + + return v; + } +} diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java index 4631543..d5603b7 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java @@ -23,6 +23,7 @@ import android.widget.Toast; import org.torproject.android.R; import org.torproject.android.backup.BackupUtils; +import org.torproject.android.storage.PermissionManager; import org.torproject.android.ui.hs.providers.HSContentProvider; public class HSActionsDialog extends DialogFragment { @@ -44,8 +45,9 @@ public class HSActionsDialog extends DialogFragment { public void onClick(View v) { Context mContext = v.getContext(); - if (usesRuntimePermissions() && !hasExternalWritePermission(mContext)) { - requestPermissions(); + if (PermissionManager.usesRuntimePermissions() + && !PermissionManager.hasExternalWritePermission(mContext)) { + PermissionManager.requestPermissions(getActivity()); return; } @@ -58,7 +60,7 @@ public class HSActionsDialog extends DialogFragment { return; } - Toast.makeText(mContext, R.string.done, Toast.LENGTH_LONG).show(); + Toast.makeText(mContext, R.string.backup_saved_at_external_storage, Toast.LENGTH_LONG).show(); Uri selectedUri = Uri.parse(backupPath.substring(0, backupPath.lastIndexOf("/"))); Intent intent = new Intent(Intent.ACTION_VIEW); @@ -104,34 +106,4 @@ public class HSActionsDialog extends DialogFragment { return actionDialog; } - - private boolean usesRuntimePermissions() { - return (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1); - } - - @SuppressLint("NewApi") - private boolean hasExternalWritePermission(Context context) { - return (context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED); - } - - private void requestPermissions() { - if (ActivityCompat.shouldShowRequestPermissionRationale - (getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - Snackbar.make(getActivity().findViewById(android.R.id.content), - R.string.please_grant_permissions_for_external_storage, - Snackbar.LENGTH_INDEFINITE).setAction("ENABLE", - new View.OnClickListener() { - @Override - public void onClick(View v) { - ActivityCompat.requestPermissions(getActivity(), - new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, - PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); - } - }).show(); - } else { - ActivityCompat.requestPermissions(getActivity(), - new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, - PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE); - } - } } diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/SelectBackupDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/SelectBackupDialog.java new file mode 100644 index 0000000..37c722b --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/SelectBackupDialog.java @@ -0,0 +1,81 @@ +package org.torproject.android.ui.hs.dialogs; + +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; +import android.support.v7.app.AlertDialog; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ListView; + +import org.torproject.android.R; +import org.torproject.android.storage.ExternalStorage; +import org.torproject.android.ui.hs.adapters.BackupAdapter; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class SelectBackupDialog extends DialogFragment { + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder backupsDialog = new AlertDialog.Builder(getActivity()); + + backupsDialog.setTitle(R.string.restore_backup); + + File backupDir = ExternalStorage.getOrCreateBackupDir(); + File[] files = null; + + try { + files = backupDir.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.toLowerCase().endsWith(".zip"); + } + }); + } catch (NullPointerException e) { + // Silent block + } + + if (files == null || files.length < 1) { + backupsDialog.setMessage(R.string.create_a_backup_first); + backupsDialog.setNegativeButton(R.string.btn_cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + + return backupsDialog.create(); + } + + final View dialog_view = getActivity().getLayoutInflater().inflate(R.layout.layout_hs_backups_list, null); + + backupsDialog.setView(dialog_view); + backupsDialog.setPositiveButton(R.string.btn_okay, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + + ListView backups = (ListView) dialog_view.findViewById(R.id.listview_hs_backups); + + List<File> zips = new ArrayList<>(); + Collections.addAll(zips, files); + + backups.setAdapter(new BackupAdapter(getContext(), R.layout.layout_hs_backups_list_item, zips)); + backups.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + // TODO + } + }); + + return backupsDialog.create(); + } +} diff --git a/app/src/main/res/layout/layout_hs_backups_list.xml b/app/src/main/res/layout/layout_hs_backups_list.xml new file mode 100644 index 0000000..6c123ff --- /dev/null +++ b/app/src/main/res/layout/layout_hs_backups_list.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/listview_hs_backups" /> +</LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_hs_backups_list_item.xml b/app/src/main/res/layout/layout_hs_backups_list_item.xml new file mode 100644 index 0000000..fe76d47 --- /dev/null +++ b/app/src/main/res/layout/layout_hs_backups_list_item.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/backup_list_item" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="15dp" + tools:paddingLeft="15dp" + android:paddingRight="15dp" + tools:paddingRight="15dp"> + + <TextView + android:id="@+id/backup_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="35sp" /> + </LinearLayout> +</LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index adeba6f..3e37d3d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -337,14 +337,16 @@ <string name="local_port">Local Port</string> <string name="onion_port">Onion Port</string> <string name="name">Name</string> + <string name="done">Done!</string> <string name="invalid_port">Invalid Port</string> <string name="copy_address_to_clipboard">Copy address to clipboard</string> <string name="backup_service">Backup Service</string> <string name="delete_service">Delete Service</string> - <string name="done">Done!</string> + <string name="backup_saved_at_external_storage">Backup saved at external storage</string> <string name="filemanager_not_available">Filemanager not available</string> <string name="please_grant_permissions_for_external_storage">Please grant permissions for external storage</string> <string name="permission_granted">Permission granted</string> <string name="permission_denied">Permission denied</string> <string name="restore_backup">Restore Backup</string> + <string name="create_a_backup_first">Create a backup first</string> </resources>

1 0

[orbot/master] insert or update
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit f153600dd1d3ef1c483ad6c06c6bfa90873729a5 Author: arrase <arrase(a)gmail.com> Date: Sun Nov 27 19:12:16 2016 +0100 insert or update --- .../ui/hiddenservices/backup/BackupUtils.java | 28 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index d446190..a11cb71 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -149,16 +149,14 @@ public class BackupUtils { try { JSONObject savedValues = new JSONObject(jString); ContentValues fields = new ContentValues(); + int port = savedValues.getInt(HSContentProvider.HiddenService.PORT); fields.put( HSContentProvider.HiddenService.NAME, savedValues.getString(HSContentProvider.HiddenService.NAME) ); - fields.put( - HSContentProvider.HiddenService.PORT, - savedValues.getInt(HSContentProvider.HiddenService.PORT) - ); + fields.put(HSContentProvider.HiddenService.PORT, port); fields.put( HSContentProvider.HiddenService.ONION_PORT, @@ -175,7 +173,27 @@ public class BackupUtils { savedValues.getInt(HSContentProvider.HiddenService.CREATED_BY_USER) ); - mResolver.insert(HSContentProvider.CONTENT_URI, fields); + Cursor service = mResolver.query( + HSContentProvider.CONTENT_URI, + HSContentProvider.PROJECTION, + HSContentProvider.HiddenService.PORT + "=" + port, + null, + null + ); + + if (service.getCount() == 0) { + mResolver.insert(HSContentProvider.CONTENT_URI, fields); + } else { + mResolver.update( + HSContentProvider.CONTENT_URI, + fields, + HSContentProvider.HiddenService.PORT + "=" + port, + null + ); + } + + service.close(); + } catch (JSONException e) { e.printStackTrace(); Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();

1 0

[orbot/master] move hidden services to files directory
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit fca54cfcdc2407810621dd5247de262cfc0d495a Author: arrase <arrase(a)gmail.com> Date: Sun Nov 27 16:03:38 2016 +0100 move hidden services to files directory --- app/build.gradle | 7 ---- app/src/main/AndroidManifest.xml | 4 +-- .../ui/hiddenservices/backup/BackupUtils.java | 16 ++++----- .../ui/hiddenservices/storage/AppDataProvider.java | 39 ---------------------- app/src/main/res/xml/hidden_services_paths.xml | 3 +- .../org/torproject/android/service/TorService.java | 8 +++-- 6 files changed, 14 insertions(+), 63 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7debed3..cc364c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,16 +26,9 @@ android { } } -repositories { - maven { - url "https://s3.amazonaws.com/repo.commonsware.com" - } -} - dependencies { compile project(':orbotservice') compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' - compile 'com.commonsware.cwac:provider:0.4.4' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b7a5e87..1704c70 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -151,12 +151,12 @@ android:authorities="org.torproject.android.ui.hiddenservices.providers" /> <provider - android:name=".ui.hiddenservices.storage.AppDataProvider" + 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="com.commonsware.cwac.provider.STREAM_PROVIDER_PATHS" + android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/hidden_services_paths"/> </provider> </application> diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index c60beb9..70da302 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -1,6 +1,5 @@ package org.torproject.android.ui.hiddenservices.backup; -import android.app.Application; import android.content.Context; import android.widget.Toast; @@ -17,9 +16,9 @@ public class BackupUtils { public BackupUtils(Context context) { mContext = context; - mHSBasePath = mContext.getDir( - TorServiceConstants.DIRECTORY_TOR_DATA, - Application.MODE_PRIVATE + mHSBasePath = new File( + mContext.getFilesDir().getAbsolutePath(), + TorServiceConstants.HIDDEN_SERVICES_DIR ); } @@ -32,8 +31,8 @@ public class BackupUtils { String zip_path = storage_path.getAbsolutePath() + "/hs" + port + ".zip"; String files[] = { - mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/hostname", - mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/private_key" + mHSBasePath + "/hs" + port + "/hostname", + mHSBasePath + "/hs" + port + "/private_key" }; ZipIt zip = new ZipIt(files, zip_path); @@ -46,11 +45,8 @@ public class BackupUtils { } public void restoreZipBackup(Integer port, String path) { - String hsBasePath; - try { - hsBasePath = mHSBasePath.getCanonicalPath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR; - File hsPath = new File(hsBasePath, "/hs" + port); + File hsPath = new File(mHSBasePath.getCanonicalPath(), "/hs" + port); if (hsPath.mkdirs()) { ZipIt zip = new ZipIt(null, path); zip.unzip(hsPath.getCanonicalPath()); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/AppDataProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/AppDataProvider.java deleted file mode 100644 index 6e55569..0000000 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/AppDataProvider.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.torproject.android.ui.hiddenservices.storage; - - -import android.app.Application; -import android.content.Context; - -import com.commonsware.cwac.provider.LocalPathStrategy; -import com.commonsware.cwac.provider.StreamProvider; -import com.commonsware.cwac.provider.StreamStrategy; - -import org.torproject.android.service.TorServiceConstants; - -import java.io.IOException; -import java.util.HashMap; - -public class AppDataProvider extends StreamProvider { - private static final String TAG = "app-data-path"; - - @Override - protected StreamStrategy buildStrategy(Context context, - String tag, String name, - String path, - HashMap<String, String> attrs) - throws IOException { - - if (TAG.equals(tag)) { - return (new LocalPathStrategy( - name, - context.getDir( - TorServiceConstants.DIRECTORY_TOR_DATA, - Application.MODE_PRIVATE - ) - ) - ); - } - - return (super.buildStrategy(context, tag, name, path, attrs)); - } -} diff --git a/app/src/main/res/xml/hidden_services_paths.xml b/app/src/main/res/xml/hidden_services_paths.xml index 943fd09..073732b 100644 --- a/app/src/main/res/xml/hidden_services_paths.xml +++ b/app/src/main/res/xml/hidden_services_paths.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <paths xmlns:android="http://schemas.android.com/apk/res/android"> - <app-data-path name="hidden-services" path="hidden_services/"/> - + <files-path name="hidden-services" path="hidden_services/" /> </paths> \ No newline at end of file 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 6d12424..c2a2431 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -531,11 +531,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon fileXtables = new File(appBinHome, TorServiceConstants.IPTABLES_ASSET_KEY); fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY); - mHSBasePath = new File(appCacheHome , TorServiceConstants.HIDDEN_SERVICES_DIR); + mHSBasePath = new File( + getFilesDir().getAbsolutePath(), + TorServiceConstants.HIDDEN_SERVICES_DIR + ); - if (!mHSBasePath.isDirectory()) { + if (!mHSBasePath.isDirectory()) mHSBasePath.mkdirs(); - } mEventHandler = new TorEventHandler(this);

1 0

[orbot/master] more margin
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 6658101dd9b41eb80744fcee2c112f82896a4262 Author: arrase <arrase(a)gmail.com> Date: Thu Nov 24 02:39:41 2016 +0100 more margin --- app/src/main/res/layout/layout_hs_backups_list_item.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/layout_hs_backups_list_item.xml b/app/src/main/res/layout/layout_hs_backups_list_item.xml index eb32ec2..6d9bfd4 100644 --- a/app/src/main/res/layout/layout_hs_backups_list_item.xml +++ b/app/src/main/res/layout/layout_hs_backups_list_item.xml @@ -20,6 +20,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="30sp" - android:layout_marginBottom="5dp" /> + android:layout_marginBottom="10dp" /> </LinearLayout> </LinearLayout> \ No newline at end of file

1 0

[orbot/master] padding
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit a49ac3fcc5c6ce3a9216f53de3e7e53cb8fa24cf Author: arrase <arrase(a)gmail.com> Date: Thu Nov 24 22:45:37 2016 +0100 padding --- app/src/main/res/layout/layout_hs_list_item.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/layout_hs_list_item.xml b/app/src/main/res/layout/layout_hs_list_item.xml index 33ed374..e8b3f4c 100644 --- a/app/src/main/res/layout/layout_hs_list_item.xml +++ b/app/src/main/res/layout/layout_hs_list_item.xml @@ -37,7 +37,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" - android:paddingLeft="10dp" /> + android:paddingLeft="10dp" + android:paddingBottom="10dp" /> </LinearLayout>

1 0

[orbot/master] bug fix and refactor
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit f79d2d9005e3f8be3b9bd0db805e04fcb9c01a8c Author: arrase <arrase(a)gmail.com> Date: Wed Nov 23 21:20:50 2016 +0100 bug fix and refactor --- .../main/java/org/torproject/android/OrbotMainActivity.java | 4 ++-- .../main/java/org/torproject/android/backup/BackupUtils.java | 12 ++++++------ .../torproject/android/ui/hs/dialogs/HSActionsDialog.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index e0fdbb0..1ea9b6e 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -649,14 +649,14 @@ public class OrbotMainActivity extends AppCompatActivity BackupUtils hsutils = new BackupUtils(getApplicationContext()); if(keyZipPath != null && keyZipPath.length() > 0) { - hsutils.restoreOnionBackup(hsPort, keyZipPath); + hsutils.restoreZipBackup(hsPort, keyZipPath); requestTorRereadConfig(); } /* TODO if(doBackup) { - backupPath = hsutils.createOnionBackup(hsPort); + backupPath = hsutils.createZipBackup(hsPort); } */ onion.close(); diff --git a/app/src/main/java/org/torproject/android/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/backup/BackupUtils.java index 5d77d17..e05532f 100644 --- a/app/src/main/java/org/torproject/android/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/backup/BackupUtils.java @@ -9,16 +9,16 @@ import org.torproject.android.storage.ExternalStorage; import java.io.File; public class BackupUtils { - private static File mHSBasePath; + private File mHSBasePath; public BackupUtils(Context context) { mHSBasePath = context.getDir( - TorServiceConstants.DIRECTORY_TOR_DATA + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR, + TorServiceConstants.DIRECTORY_TOR_DATA, Application.MODE_PRIVATE ); } - public String createOnionBackup(Integer port) { + public String createZipBackup(Integer port) { ExternalStorage storage = new ExternalStorage(); String storage_path = storage.createBackupDir(); @@ -28,8 +28,8 @@ public class BackupUtils { String zip_path = storage_path + "/hs" + port + ".zip"; String files[] = { - mHSBasePath + "/hs" + port + "/hostname", - mHSBasePath + "/hs" + port + "/private_key" + mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/hostname", + mHSBasePath + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + port + "/private_key" }; ZipIt zip = new ZipIt(files, zip_path); @@ -41,7 +41,7 @@ public class BackupUtils { return zip_path; } - public void restoreOnionBackup(Integer port, String path) { + public void restoreZipBackup(Integer port, String path) { ZipIt zip = new ZipIt(null, path); zip.unzip(mHSBasePath + "/hs" + port); } diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java index f432a01..4631543 100644 --- a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java @@ -50,7 +50,7 @@ public class HSActionsDialog extends DialogFragment { } BackupUtils hsutils = new BackupUtils(mContext); - String backupPath = hsutils.createOnionBackup(Integer.parseInt(arguments.getString("port"))); + String backupPath = hsutils.createZipBackup(Integer.parseInt(arguments.getString("port"))); if (backupPath == null || backupPath.length() < 1) { Toast.makeText(mContext, R.string.error, Toast.LENGTH_LONG).show();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2017