notification_updater_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;
+    -

.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

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

     		super.onNewIntent(intent);
     		//Handle the intent which launches this class when the stop button (in notification) is clicked
     		int stopTorFlag = intent.getIntExtra("stopTorFlag",0);
     		//If the stop tor flag was set to 1 then we need to stop the application , by observing the previous code we see that we
     		//need to call 	stopTor().
     		if(stopTorFlag==1)
+    		{
     			try {
     				stopTor();
     			} catch (RemoteException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
     			//We also kill the android application process so that the user can return to the application he was on when he clicked the
     			//stop button.
     			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;
-...
+    	}
     	@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)
     			notification.flags |= flags;
     		Context context = getApplicationContext();
     		CharSequence contentTitle = getString(R.string.app_name);
     		CharSequence contentText = notifyMsg;
     		//Reusable code has been moved here.
     		Intent notificationIntent = new Intent(this, Orbot.class);
     		PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0);
     		notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent);
     		mNotificationManager.notify(notifyId, notification);
     		//The code which was originally present here has been modified in order to implement newer standards keeping in mind the
     		//problem of backward compatibility.
     		if(Build.VERSION.SDK_INT<Build.VERSION_CODES.JELLY_BEAN)
+    		{
     			CharSequence tickerText = notifyMsg;
     			long when = System.currentTimeMillis();
     			Notification notification = new Notification(icon, tickerText, when);
     			if (prefPersistNotifications && flags != -1)
     				notification.flags |= flags;
     			Context context = getApplicationContext();
     			CharSequence contentTitle = getString(R.string.app_name);
     			CharSequence contentText = notifyMsg;
     			notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent);
     			mNotificationManager.notify(notifyId, notification);
+    		}
     		//This is the new code which can be used for versions above api 16 (Jelly Bean).
     		else if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.JELLY_BEAN)
+    		{
     			Notification notification = new Notification.Builder(this)
     					.setSmallIcon(icon)
     					.setContentTitle(getString(R.string.app_name))
     					.setContentText(notifyMsg)
     					.setContentIntent(contentIntent)
     					.build();
     			if (prefPersistNotifications && flags != -1)
     				notification.flags |= flags;
     			mNotificationManager.notify(notifyId,notification);
+    		}
+    	}
         /* (non-Javadoc)
+    -

     import android.os.IBinder;
     import android.os.Message;
     import android.os.RemoteException;
     import android.preference.PreferenceManager;
     import android.text.ClipboardManager;
     import android.text.Layout;
     import android.text.method.ScrollingMovementMethod;
-...
     import android.view.View.OnLongClickListener;
     import android.view.View.OnTouchListener;
     import android.view.animation.AccelerateInterpolator;
     import android.view.animation.Animation;
     import android.widget.Button;
     import android.widget.SlidingDrawer;
     import android.widget.TextView;
-...
     		int stopTorFlag = intent.getIntExtra("stopTorFlag",0);
     		//If the stop tor flag was set to 1 then we need to stop the application , by observing the previous code we see that we
     		//need to call 	stopTor().
     		Log.i(TAG,"stopTorFlag"+stopTorFlag);
     		if(stopTorFlag==1)
+    		{
     			try {
-...
+    			}
     			//We also kill the android application process so that the user can return to the application he was on when he clicked the
     			//stop button.
     			android.os.Process.killProcess(android.os.Process.myPid());
     			//Luckily for me , the unbindService() exitst! If we just try to do this.finish() , we get a service has leaked error
     			//in the logcat and therefore I have used unbindService() before it and it seems to work perfectly!
     			unbindService();
     			this.finish();
+    		}
     		updateStatus("");

+    		}
     		NotificationCompat.Builder mNotifyBuilder;
     		Notification.Builder mNewNotifyBuilder;
     		@SuppressLint("NewApi")
     		private void startNotification (String message, boolean persistent)
+    		{
     			//Reusable code.
     			Intent intent = new Intent(TorService.this, Orbot.class);
     			PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
     			if (mNotifyBuilder == null)
     			if (mNotificationManager == null)
     				mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
     			//Older version of code is here and will be used if api < 16.
     			if(Build.VERSION.SDK_INT<Build.VERSION_CODES.JELLY_BEAN)
+    			{
     				mNotifyBuilder = new NotificationCompat.Builder(this)
     				    .setContentTitle(getString(R.string.app_name))
     				    .setContentText( getString(R.string.status_activated))
     				    .setSmallIcon(R.drawable.ic_stat_tor);
     				if (mNotifyBuilder == null)
+    				{
     					mNotifyBuilder = new NotificationCompat.Builder(this)
     						.setContentTitle(getString(R.string.app_name))
     						.setContentText( getString(R.string.status_activated))
     						.setSmallIcon(R.drawable.ic_stat_tor);
     					mNotifyBuilder.setContentIntent(pendIntent);
+    				}
     				Intent intent = new Intent(TorService.this, Orbot.class);
     				PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
     				mNotifyBuilder.setOngoing(persistent);
     				mNotifyBuilder.setContentText(message);
     				mNotifyBuilder.setContentIntent(pendIntent);
     				mNotificationManager.notify(
     			    			NOTIFY_ID,
     			    			mNotifyBuilder.getNotification());
+    			}
     			else if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.JELLY_BEAN)
+    			{
     				if(mNewNotifyBuilder==null)
+    				{
     					Intent stopTor = new Intent(this,Orbot.class);
     					stopTor.putExtra("stopTorFlag",1);
     					PendingIntent stopTorIntent = PendingIntent.getActivity(this, 0, stopTor, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_UPDATE_CURRENT);
     					mNewNotifyBuilder = new Notification.Builder(this)
     						.setContentTitle(getString(R.string.app_name))
     						.setContentText(getString(R.string.status_activated))
     						.setSmallIcon(R.drawable.ic_stat_tor)
     						.addAction(R.drawable.button_stop, "STOP", stopTorIntent);
     					mNewNotifyBuilder.setContentIntent(pendIntent);
+    				}
     				mNewNotifyBuilder.setOngoing(persistent);
     				mNewNotifyBuilder.setContentText(message);
+    			}
     			if (mNotificationManager == null)
+    			{
     				mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
     				mNotificationManager.notify(
     						NOTIFY_ID,
     						mNewNotifyBuilder.build());
+    			}
     			mNotifyBuilder.setOngoing(persistent);
     			mNotifyBuilder.setContentText(message);
     			  mNotificationManager.notify(
     			    		NOTIFY_ID,
     			            mNotifyBuilder.getNotification());
+    		}
+    -

Core Apps » Orbot