allow managed backups field
This commit is contained in:
parent
e152dd3810
commit
4fea84cc5f
|
@ -572,7 +572,7 @@ public class OrbotMainActivity extends AppCompatActivity
|
||||||
stopVpnService();
|
stopVpnService();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void enableHiddenServicePort (String hsName, int hsPort, int hsRemotePort, boolean getGey) throws RemoteException, InterruptedException
|
private void enableHiddenServicePort (String hsName, int hsPort, int hsRemotePort, boolean allowBackups) throws RemoteException, InterruptedException
|
||||||
{
|
{
|
||||||
String onionHostname = null;
|
String onionHostname = null;
|
||||||
|
|
||||||
|
@ -593,6 +593,15 @@ public class OrbotMainActivity extends AppCompatActivity
|
||||||
Cursor row = cr.query(HSContentProvider.CONTENT_URI, mProjection, "port=" + mHsPort, null, null);
|
Cursor row = cr.query(HSContentProvider.CONTENT_URI, mProjection, "port=" + mHsPort, null, null);
|
||||||
|
|
||||||
if(row == 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);
|
cr.insert(HSContentProvider.CONTENT_URI, fields);
|
||||||
} else {
|
} else {
|
||||||
onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN));
|
onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN));
|
||||||
|
@ -665,7 +674,7 @@ public class OrbotMainActivity extends AppCompatActivity
|
||||||
final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1);
|
final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1);
|
||||||
final int hiddenServiceRemotePort = getIntent().getIntExtra("hs_onion_port", -1);
|
final int hiddenServiceRemotePort = getIntent().getIntExtra("hs_onion_port", -1);
|
||||||
final String hiddenServiceName = getIntent().getStringExtra("hs_name");
|
final String hiddenServiceName = getIntent().getStringExtra("hs_name");
|
||||||
final boolean getHiddenServiceKey = getIntent().getBooleanExtra("hs_get_key",false);
|
final boolean hiddenServiceAllowBackups = getIntent().getBooleanExtra("hs_allow_namaged_backup",false);
|
||||||
|
|
||||||
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
|
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
|
||||||
|
|
||||||
|
@ -676,7 +685,7 @@ public class OrbotMainActivity extends AppCompatActivity
|
||||||
try {
|
try {
|
||||||
enableHiddenServicePort (
|
enableHiddenServicePort (
|
||||||
hiddenServiceName, hiddenServicePort,
|
hiddenServiceName, hiddenServicePort,
|
||||||
hiddenServiceRemotePort, getHiddenServiceKey
|
hiddenServiceRemotePort, hiddenServiceAllowBackups
|
||||||
);
|
);
|
||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
// TODO Auto-generated catch block
|
// TODO Auto-generated catch block
|
||||||
|
|
|
@ -16,6 +16,7 @@ public class HSDatabase extends SQLiteOpenHelper {
|
||||||
"name TEXT, " +
|
"name TEXT, " +
|
||||||
"domain TEXT, " +
|
"domain TEXT, " +
|
||||||
"onion_port INTEGER, " +
|
"onion_port INTEGER, " +
|
||||||
|
"allow_managed_backups INTEGER DEFAULT 0, " +
|
||||||
"port INTEGER);";
|
"port INTEGER);";
|
||||||
|
|
||||||
public HSDatabase(Context context) {
|
public HSDatabase(Context context) {
|
||||||
|
|
|
@ -53,6 +53,13 @@
|
||||||
android:id="@+id/hsOnionPort"
|
android:id="@+id/hsOnionPort"
|
||||||
android:inputType="number" />
|
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
|
<LinearLayout
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -73,6 +80,7 @@
|
||||||
android:id="@+id/HSDialogSave"
|
android:id="@+id/HSDialogSave"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
style="@style/Widget.AppCompat.Button.Borderless.Colored" />
|
style="@style/Widget.AppCompat.Button.Borderless.Colored" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -339,4 +339,5 @@
|
||||||
<string name="onion_port">Onion Port</string>
|
<string name="onion_port">Onion Port</string>
|
||||||
<string name="name">Name</string>
|
<string name="name">Name</string>
|
||||||
<string name="invalid_port">Invalid Port</string>
|
<string name="invalid_port">Invalid Port</string>
|
||||||
|
<string name="allow_managed_backup">Allow managed backups</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue