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

purge dead and unused code from TorService

This commit is contained in:
Hans-Christoph Steiner 2015-06-08 20:43:02 -04:00
parent 12d92f48f5
commit 6e13a7e369
1 changed files with 2 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/org/torproject/android/service/TorService.java
View File

@ -146,7 +146,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private boolean mUseVPN = false; private boolean mUseVPN = false;
boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
private ExecutorService mExecutor = Executors.newFixedThreadPool(1); private ExecutorService mExecutor = Executors.newFixedThreadPool(1);
private NumberFormat mNumberFormat = null; private NumberFormat mNumberFormat = null;
@ -211,7 +210,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return false; return false;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see android.app.Service#onLowMemory() * @see android.app.Service#onLowMemory()
*/ */
@ -223,10 +221,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
} }
public String getTorStatus() {
return mCurrentStatus;
}
private void clearNotifications () private void clearNotifications ()
{ {
if (mNotificationManager != null) if (mNotificationManager != null)
@ -235,7 +229,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
hmBuiltNodes.clear(); hmBuiltNodes.clear();
mNotificationShowing = false; mNotificationShowing = false;
} }
@SuppressLint("NewApi") @SuppressLint("NewApi")
@ -280,27 +273,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
mNotification = mNotifyBuilder.build(); mNotification = mNotifyBuilder.build();
if (Build.VERSION.SDK_INT >= 16 && mShowExpandedNotifications) { if (Build.VERSION.SDK_INT >= 16 && mShowExpandedNotifications) {
// Create remote view that needs to be set as bigContentView for the notification. // Create remote view that needs to be set as bigContentView for the notification.
RemoteViews expandedView = new RemoteViews(this.getPackageName(), RemoteViews expandedView = new RemoteViews(this.getPackageName(),
R.layout.layout_notification_expanded); R.layout.layout_notification_expanded);
StringBuffer sbInfo = new StringBuffer(); StringBuffer sbInfo = new StringBuffer();
if (notifyType == NOTIFY_ID) if (notifyType == NOTIFY_ID)
expandedView.setTextViewText(R.id.text, notifyMsg); expandedView.setTextViewText(R.id.text, notifyMsg);
else else
{ {
expandedView.setTextViewText(R.id.info, notifyMsg); expandedView.setTextViewText(R.id.info, notifyMsg);
} }
if (hmBuiltNodes.size() > 0) if (hmBuiltNodes.size() > 0)
{ {
//sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n ');
Set<String> itBuiltNodes = hmBuiltNodes.keySet(); Set<String> itBuiltNodes = hmBuiltNodes.keySet();
for (String key : itBuiltNodes) for (String key : itBuiltNodes)
{ {
@ -626,7 +613,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
} }
initBinariesAndDirectories(); initBinariesAndDirectories();
updateSettings(); updateSettings();
@ -1107,12 +1093,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private int initControlConnection (int maxTries, boolean isReconnect) throws Exception, RuntimeException private int initControlConnection (int maxTries, boolean isReconnect) throws Exception, RuntimeException
{ {
int i = 0;
int controlPort = -1; int controlPort = -1;
int attempt = 0; int attempt = 0;
logNotice( "Waiting for control port..."); logNotice( "Waiting for control port...");
while (conn == null && attempt++ < maxTries) while (conn == null && attempt++ < maxTries)
@ -1148,9 +1131,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// logNotice("waiting..."); // logNotice("waiting...");
Thread.sleep(1000); } Thread.sleep(1000); }
catch (Exception e){} catch (Exception e){}
} }
if (conn != null) if (conn != null)
@ -1333,44 +1313,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return result; return result;
} }
/*
private void getTorStatus () throws IOException
{
try
{
if (conn != null)
{
// get a single value.
// get several values
if (mCurrentStatus == STATUS_CONNECTING)
{
//Map vals = conn.getInfo(Arrays.asList(new String[]{
// "status/bootstrap-phase", "status","version"}));
String bsPhase = conn.getInfo("status/bootstrap-phase");
Log.d(TAG, "bootstrap-phase: " + bsPhase);
}
else
{
// String status = conn.getInfo("status/circuit-established");
// Log.d(TAG, "status/circuit-established=" + status);
}
}
}
catch (Exception e)
{
Log.d(TAG, "Unable to get Tor status from control port");
mCurrentStatus = STATUS_UNAVAILABLE;
}
}*/
public void addEventHandler () throws Exception public void addEventHandler () throws Exception
{ {
// We extend NullEventHandler so that we don't need to provide empty // We extend NullEventHandler so that we don't need to provide empty
@ -1386,9 +1328,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// "DEBUG", "INFO", "NOTICE", "WARN", "ERR"})); // "DEBUG", "INFO", "NOTICE", "WARN", "ERR"}));
logNotice( "SUCCESS added control port event handler"); logNotice( "SUCCESS added control port event handler");
} }
/** /**
@ -1406,7 +1345,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return mPortSOCKS; return mPortSOCKS;
} }
public void setTorProfile(String newState) { public void setTorProfile(String newState) {
if (newState == STATUS_ON) if (newState == STATUS_ON)
@ -2473,7 +2411,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
} }
if (mUseVPN) if (mUseVPN)
{ {
extraLines.append("DNSListenAddress" + ' ' + "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT).append('\n'); extraLines.append("DNSListenAddress" + ' ' + "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT).append('\n');
@ -2493,33 +2430,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return new String(out); return new String(out);
} }
/*
private void enableSocks (String socks, boolean safeSocks) throws RemoteException
{
updateConfiguration("SOCKSPort", socks, false);
updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false);
updateConfiguration("TestSocks", "1", false);
updateConfiguration("WarnUnsafeSocks", "1", false);
saveConfiguration();
}
private void enableTransProxyAndDNSPorts (String transPort, String dnsPort) throws RemoteException
{
logMessage ("Transparent Proxying: enabling port...");
updateConfiguration("TransPort",transPort,false);
updateConfiguration("DNSPort",dnsPort,false);
updateConfiguration("VirtualAddrNetwork","10.192.0.0/10",false);
updateConfiguration("AutomapHostsOnResolve","1",false);
saveConfiguration();
}*/
private void blockPlaintextPorts (String portList) throws RemoteException
{
updateConfiguration("RejectPlaintextPorts",portList,false);
}
//using Google DNS for now as the public DNS server //using Google DNS for now as the public DNS server
private String writeDNSFile () throws IOException private String writeDNSFile () throws IOException
{ {