notification_stop_button_amoghbl1.patch

project.properties
8	8	# project structure.
9	9
10	10	# Project target.
11		target=android-17
	11	target=android-18
12	12	android.library.reference.1=external/ActionBarSherlock/actionbarsherlock

     	private long lastRead = -1;
     	private long lastWritten = -1;
     	private static int notificationCounter = 0;
     	private NotificationManager mNotificationManager = null;
-...
     			mTotalTrafficRead += read;
     			sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead);
     			if (++notificationCounter%10==0)
     			    startService(new Intent(INTENT_TOR_SERVICE));
+    		}
     		lastWritten = written;
+    -

     	private long lastRead = -1;
     	private long lastWritten = -1;
     	private static int notificationCounter = 0;
     	private NotificationManager mNotificationManager = null;
-...
     			mTotalTrafficRead += read;
     			sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead);
     			if (++notificationCounter%10==0)
     			    startService(new Intent(INTENT_TOR_SERVICE));
+    		}
     		lastWritten = written;
+    -

     From bf4b17acd6beb6d7e5e85c46a4d290a3e3080f5c Mon Sep 17 00:00:00 2001
     From: amoghbl1 <amoghbl1@gmail.com>
     Date: Fri, 13 Dec 2013 03:41:05 +0530
     Subject: [PATCH] notification bug fix
     ---
      src/org/torproject/android/service/TorService.java | 10 ++++++++--
 file changed, 8 insertions(+), 2 deletions(-)
     diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
     index 69b46fd..90bebb6 100644
     --- a/src/org/torproject/android/service/TorService.java
     +++ b/src/org/torproject/android/service/TorService.java
@@ -99,8 +99,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
      	private long lastRead = -1;
      	private long lastWritten = -1;
+    -
+    -
+    +
+    +
     +	private static int notificationCounter = 0;
+    +
      	private NotificationManager mNotificationManager = null;
          public void logMessage(String msg)
@@ -1180,6 +1182,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst
      			mTotalTrafficRead += read;
      			sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead);
+    +
     +			if(++notificationCounter%10==0)
     +			    startService(new Intent(INTENT_TOR_SERVICE));
+    +
+     		}
      		lastWritten = written;
     --
 .8.3.2
+    -

     import org.torproject.android.share.ShareItem;
     import org.torproject.android.share.ShareService;
     import android.annotation.SuppressLint;
     import android.app.Application;
     import android.app.Notification;
     import android.app.NotificationManager;
-...
+    	}
     	@SuppressLint("NewApi")
     	private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags)
+    	{
-...
     		CharSequence tickerText = notifyMsg;
     		long when = System.currentTimeMillis();
     		/*
     		Notification notification = new Notification(icon, tickerText, when);
     		if (prefPersistNotifications && flags != -1)
-...
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent);
     		*/
     		Intent notificationIntent = new Intent(this, Orbot.class);
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		Notification notification = new Notification.Builder(this)
     					.setContentTitle(getString(R.string.app_name))
     					.setContentText(notifyMsg)
     					.setContentIntent(contentIntent)
     					.build();
     		if (prefPersistNotifications && flags != -1)
     			notification.flags |= flags;
     		mNotificationManager.notify(notifyId, notification);
+    -

     import org.torproject.android.share.ShareItem;
     import org.torproject.android.share.ShareService;
     import android.annotation.SuppressLint;
     import android.app.Application;
     import android.app.Notification;
     import android.app.NotificationManager;
-...
+    	}
     	@SuppressLint("NewApi")
     	private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags)
+    	{
-...
     		CharSequence tickerText = notifyMsg;
     		long when = System.currentTimeMillis();
     		/*
     		Notification notification = new Notification(icon, tickerText, when);
     		if (prefPersistNotifications && flags != -1)
-...
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent);
     		*/
     		Intent notificationIntent = new Intent(this, Orbot.class);
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		Notification notification = new Notification.Builder(this)
     					.setContentTitle(getString(R.string.app_name))
     					.setContentText(notifyMsg)
     					.setContentIntent(contentIntent)
     					.build();
     		if (prefPersistNotifications && flags != -1)
     			notification.flags |= flags;
     		mNotificationManager.notify(notifyId, notification);
+    -

.settings/org.eclipse.jdt.core.prefs
	1	eclipse.preferences.version=1
	2	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
	3	org.eclipse.jdt.core.compiler.compliance=1.6
	4	org.eclipse.jdt.core.compiler.source=1.6

             	StrictMode.setVmPolicy(vmpolicy);
+            	}
             */
             //Kill tor if the button stop tor (in the notification) was clicked!
             //Same code needs to be executed in onResume
             mPrefs = getPrefs();
             mPrefs.registerOnSharedPreferenceChangeListener(this);
-...
     		super.onNewIntent(intent);
     		int stopTorFlag=intent.getIntExtra("stopTorFlag", 0);
             if(stopTorFlag==1)
+            {
             	try {
     				stopTor();
     			} catch (RemoteException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
             	android.os.Process.killProcess(android.os.Process.myPid());
+            }
     		updateStatus("");
     		handleIntents();
+    	}

     import org.torproject.android.share.ShareItem;
     import org.torproject.android.share.ShareService;
     import android.annotation.SuppressLint;
     import android.app.Application;
     import android.app.Notification;
     import android.app.NotificationManager;
-...
     	private long lastRead = -1;
     	private long lastWritten = -1;
     	private static int notificationCounter = 0;
     	private NotificationManager mNotificationManager = null;
         public void logMessage(String msg)
-...
+    	}
     	@SuppressLint("NewApi")
     	private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags)
+    	{
     		/*
     		CharSequence tickerText = notifyMsg;
     		long when = System.currentTimeMillis();
     		Notification notification = new Notification(icon, tickerText, when);
     		if (prefPersistNotifications && flags != -1)
-...
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent);
     		 */
     		Intent notificationIntent = new Intent(this, Orbot.class);
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		Notification notification = new Notification.Builder(this)
     					.setContentTitle(getString(R.string.app_name))
     					.setContentText(notifyMsg)
     					.setContentIntent(contentIntent)
     					.setSmallIcon(icon)
     					.build();
     		if (prefPersistNotifications && flags != -1)
     			notification.flags |= flags;
     		mNotificationManager.notify(notifyId, notification);
+    	}
         /* (non-Javadoc)
-...
+    			}
+    		}
     		NotificationCompat.Builder mNotifyBuilder;
     		Notification.Builder mNotifyBuilder;
     		@SuppressLint("NewApi")
     		private void startNotification (String message, boolean persistent)
+    		{
     			if (mNotifyBuilder == null)
+    			{
     				mNotifyBuilder = new NotificationCompat.Builder(this)
     				Intent stopTor = new Intent(this,Orbot.class);
     				stopTor.putExtra("stopTorFlag", 1);
     				PendingIntent stopTorIntent = PendingIntent.getActivity(this, 0, stopTor, 0);
     				mNotifyBuilder = new Notification.Builder(this)
     				    .setContentTitle(getString(R.string.app_name))
     				    .setContentText( getString(R.string.status_activated))
     				    .setSmallIcon(R.drawable.ic_stat_tor);
     				    .setSmallIcon(R.drawable.ic_stat_tor)
     				    .addAction(R.drawable.icon, "STOP", stopTorIntent);
     				Intent intent = new Intent(TorService.this, Orbot.class);
     				PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
-...
     			mTotalTrafficRead += read;
     			sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead);
     			if(++notificationCounter%10==0)
     			    startService(new Intent(INTENT_TOR_SERVICE));
+    		}
     		lastWritten = written;

     				    .setContentTitle(getString(R.string.app_name))
     				    .setContentText( getString(R.string.status_activated))
     				    .setSmallIcon(R.drawable.ic_stat_tor)
     				    .addAction(R.drawable.icon, "STOP", stopTorIntent);
     				    .addAction(R.drawable.button_stop, "STOP", stopTorIntent);
     				Intent intent = new Intent(TorService.this, Orbot.class);
     				PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
+    -

Core Apps » Orbot