dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changes for new securety layer

This commit is contained in:
arrase 2016-11-17 19:34:08 +01:00
parent 21acd568b1
commit 6b3fc6183e
5 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/torproject/android/OrbotMainActivity.java
View File

@ -572,7 +572,7 @@ public class OrbotMainActivity extends AppCompatActivity
stopVpnService();
}
private void enableHiddenServicePort (String hsName, int hsPort, int hsRemotePort, boolean allowBackups) throws RemoteException, InterruptedException
private void enableHiddenServicePort (String hsName, int hsPort, int hsRemotePort) throws RemoteException, InterruptedException
{
String onionHostname = null;
@ -593,15 +593,6 @@ public class OrbotMainActivity extends AppCompatActivity
Cursor row = cr.query(HSContentProvider.CONTENT_URI, mProjection, "port=" + mHsPort, null, null);
if(row == null) {
/*
* For security reasons:
*
* Allow managed backups option can only be set to a arbitrary true or false value when a service is created
* Subsequently an application can only change this value to false via Intent service
* Modifying this value to true again can only be performed by the user through the Orbot interface
*
*/
fields.put("allow_managed_backups", allowBackups);
cr.insert(HSContentProvider.CONTENT_URI, fields);
} else {
onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN));
@ -674,7 +665,6 @@ public class OrbotMainActivity extends AppCompatActivity
final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1);
final int hiddenServiceRemotePort = getIntent().getIntExtra("hs_onion_port", -1);
final String hiddenServiceName = getIntent().getStringExtra("hs_name");
final boolean hiddenServiceAllowBackups = getIntent().getBooleanExtra("hs_allow_namaged_backup",false);
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
@ -684,8 +674,7 @@ public class OrbotMainActivity extends AppCompatActivity
try {
enableHiddenServicePort (
hiddenServiceName, hiddenServicePort,
hiddenServiceRemotePort, hiddenServiceAllowBackups
hiddenServiceName, hiddenServicePort, hiddenServiceRemotePort
);
} catch (RemoteException e) {
// TODO Auto-generated catch block

1
app/src/main/java/org/torproject/android/ui/hs/database/HSDatabase.java
View File

@ -16,7 +16,6 @@ public class HSDatabase extends SQLiteOpenHelper {
"name TEXT, " +
"domain TEXT, " +
"onion_port INTEGER, " +
"allow_managed_backups INTEGER DEFAULT 0, " +
"port INTEGER);";
public HSDatabase(Context context) {

7
app/src/main/java/org/torproject/android/ui/hs/dialogs/HSDataDialog.java
View File

@ -45,10 +45,8 @@ public class HSDataDialog extends DialogFragment {
((EditText) dialog_view.findViewById(R.id.hsOnionPort)).getText().toString()
);
Boolean allowBackups = ((CheckBox) dialog_view.findViewById(R.id.allow_managed_backup)).isEnabled();
if (checkInput(localPort,onionPort)) {
saveData(serverName, localPort,onionPort,allowBackups);
saveData(serverName, localPort,onionPort);
serverDataDialog.dismiss();
}
}
@ -80,12 +78,11 @@ public class HSDataDialog extends DialogFragment {
return is_ok;
}
private void saveData(String name, Integer local, Integer remote, Boolean allowBackups) {
private void saveData(String name, Integer local, Integer remote) {
ContentValues fields = new ContentValues();
fields.put("name", name);
fields.put("port", local);
fields.put("onion_port", remote);
fields.put("allow_managed_backups", allowBackups);
ContentResolver cr = getContext().getContentResolver();

7
app/src/main/res/layout/dialog_hs_data.xml
View File

@ -53,13 +53,6 @@
android:id="@+id/hsOnionPort"
android:inputType="number" />
<CheckBox
android:text="@string/allow_managed_backup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/allow_managed_backup"
android:layout_weight="1" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"

1
app/src/main/res/values/strings.xml
View File

@ -339,5 +339,4 @@
<string name="onion_port">Onion Port</string>
<string name="name">Name</string>
<string name="invalid_port">Invalid Port</string>
<string name="allow_managed_backup">Allow managed backups</string>
</resources>