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

handle NPE on number format instance

This commit is contained in:
Nathan Freitas 2015-04-13 10:25:58 -04:00
parent ec24428915
commit 1bc427b50e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,6 +604,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
{ {
try try
{ {
mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers!
if (mNotificationManager == null) if (mNotificationManager == null)
{ {
@ -636,7 +637,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
} }
}).start(); }).start();
mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers!
if (OrbotVpnService.mSocksProxyPort == -1) if (OrbotVpnService.mSocksProxyPort == -1)
OrbotVpnService.mSocksProxyPort = (int)((Math.random()*1000)+10000); OrbotVpnService.mSocksProxyPort = (int)((Math.random()*1000)+10000);
@ -1619,10 +1619,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// Converts the supplied argument into a string. // Converts the supplied argument into a string.
// Under 2Mb, returns "xxx.xKb" // Under 2Mb, returns "xxx.xKb"
// Over 2Mb, returns "xxx.xxMb" // Over 2Mb, returns "xxx.xxMb"
if (count < 1e6) if (mNumberFormat != null)
return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "Kbps"; if (count < 1e6)
else return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "Kbps";
return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "Mbps"; else
return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "Mbps";
else
return "";
//return count+" kB"; //return count+" kB";
} }