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

Merge branch 'master' into hidden_services 

# Conflicts:
#	app/src/main/java/org/torproject/android/OrbotMainActivity.java
This commit is contained in:
Juan Ezquerro LLanes 2016-11-29 11:09:49 +01:00
parent f6f4d26645 ff61d66bcf
commit 3ba1d395ea
4 changed files with 834 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

15
app/src/main/res/layout/layout_main.xml
View File

@ -78,7 +78,20 @@
</LinearLayout>
<TextView
android:id="@+id/lblStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:fontFamily="sans-serif-light"
android:text=""
android:lines="1"
android:maxLines="1"
android:layout_margin="12dp"
android:layout_alignParentBottom="true"
android:gravity="center"
android:ellipsize="end"
/>
</RelativeLayout>

12
app/src/main/res/layout/layout_orbot_control.xml
View File

@ -107,17 +107,7 @@
/>
</RelativeLayout>
<TextView
android:id="@+id/lblStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:fontFamily="sans-serif-light"
android:text=""
android:lines="2"
android:maxLines="2"
android:layout_margin="12dp"
/>
</LinearLayout>

27
orbotservice/src/main/java/org/torproject/android/service/TorService.java
View File

@ -543,14 +543,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
if (mNotificationManager == null)
{
IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(mNetworkStateReceiver , mNetworkStateFilter);
mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
}
IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(mNetworkStateReceiver , mNetworkStateFilter);
new Thread(new Runnable ()
{
public void run ()
@ -735,7 +734,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
} else if (mCurrentStatus == STATUS_ON) {
sendCallbackLogMessage("Ignoring start request, already started.");
setTorNetworkEnabled (true);
return;
}
@ -1525,7 +1525,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
mNetworkType = newNetType;
mConnectivity = newConnectivityState;
if (doNetworKSleep)
if (doNetworKSleep && mCurrentStatus != STATUS_OFF)
{
setTorNetworkEnabled (mConnectivity);
@ -1543,18 +1543,15 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
try {
if (mCurrentStatus != STATUS_OFF)
if (mConnectivity)
{
if (mConnectivity)
if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh())
{
if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh())
{
disableTransparentProxy();
enableTransparentProxy();
disableTransparentProxy();
enableTransparentProxy();
}
}
}