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

adds optional boolean to the intent

This commit is contained in:
arrase 2016-11-17 04:17:08 +01:00
parent 0131cf20f0
commit 94a3b0b107
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,7 @@ public class OrbotMainActivity extends AppCompatActivity
stopVpnService(); stopVpnService();
} }
private void enableHiddenServicePort (String hsName, int hsPort) throws RemoteException, InterruptedException private void enableHiddenServicePort (String hsName, int hsPort, boolean getGey) throws RemoteException, InterruptedException
{ {
String onionHostname=""; String onionHostname="";
String[] mProjection = new String[]{ String[] mProjection = new String[]{
@ -580,6 +580,7 @@ public class OrbotMainActivity extends AppCompatActivity
ContentValues fields = new ContentValues(); ContentValues fields = new ContentValues();
fields.put("name", hsName); fields.put("name", hsName);
fields.put("port", hsPort); fields.put("port", hsPort);
ContentResolver cr = getContentResolver(); ContentResolver cr = getContentResolver();
Cursor row = cr.query(HSContentProvider.CONTENT_URI, mProjection, "port="+hsPort, null, null); Cursor row = cr.query(HSContentProvider.CONTENT_URI, mProjection, "port="+hsPort, null, null);
@ -594,9 +595,9 @@ public class OrbotMainActivity extends AppCompatActivity
requestTorRereadConfig(); requestTorRereadConfig();
// TODO: Wait for hostname // TODO: Wait for hostname
Intent nResult = new Intent(); Intent nResult = new Intent();
nResult.putExtra("hs_host", onionHostname); nResult.putExtra("hs_host", onionHostname);
// TODO: Add key
setResult(RESULT_OK, nResult); setResult(RESULT_OK, nResult);
finish(); finish();
@ -621,6 +622,7 @@ public class OrbotMainActivity extends AppCompatActivity
{ {
final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1); final int hiddenServicePort = getIntent().getIntExtra("hs_port", -1);
final String hiddenServiceName = getIntent().getStringExtra("hs_name"); final String hiddenServiceName = getIntent().getStringExtra("hs_name");
final boolean getHiddenServiceKey = getIntent().getBooleanExtra("hs_key",false);
DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
@ -629,8 +631,9 @@ public class OrbotMainActivity extends AppCompatActivity
case DialogInterface.BUTTON_POSITIVE: case DialogInterface.BUTTON_POSITIVE:
try { try {
enableHiddenServicePort (hiddenServiceName, hiddenServicePort); enableHiddenServicePort (
hiddenServiceName, hiddenServicePort, getHiddenServiceKey
);
} catch (RemoteException e) { } catch (RemoteException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();