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

small fixes for service (NPE handling) and resource installer

This commit is contained in:
Nathan Freitas 2014-04-16 16:22:09 -04:00
parent e1ea8dbd07
commit eab54f7af9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/torproject/android/service/TorResourceInstaller.java
View File

@ -150,7 +150,7 @@ public class TorResourceInstaller implements TorServiceConstants {
/* /*
* Write the inputstream contents to the file * Write the inputstream contents to the file
*/ */
private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException
{ {
byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE];
@ -187,7 +187,7 @@ public class TorResourceInstaller implements TorServiceConstants {
} }
//copy the file from inputstream to File output - alternative impl //copy the file from inputstream to File output - alternative impl
public void copyFile (InputStream is, File outputFile) public static void copyFile (InputStream is, File outputFile)
{ {
try { try {
@ -230,7 +230,7 @@ public class TorResourceInstaller implements TorServiceConstants {
* @throws IOException on error * @throws IOException on error
* @throws InterruptedException when interrupted * @throws InterruptedException when interrupted
*/ */
private static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException
{ {
final String abspath = file.getAbsolutePath(); final String abspath = file.getAbsolutePath();
// Write the iptables binary // Write the iptables binary

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

@ -199,9 +199,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
private void clearNotifications () private void clearNotifications ()
{ {
if (mNotificationManager != null)
mNotificationManager.cancelAll(); mNotificationManager.cancelAll();
} }
private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags, boolean isOngoing) private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags, boolean isOngoing)