Merge branch 'feature/foreground_service' into development

Conflicts:
	src/main/res/values/strings.xml

src/main/java/eu/siacs/conversations/services/NotificationService.java

@@ -38,6 +38,7 @@ public class NotificationService {
 	private LinkedHashMap<String, ArrayList<Message>> notifications = new LinkedHashMap<String, ArrayList<Message>>();
 
 	public static int NOTIFICATION_ID = 0x2342;
+	public static int FOREGROUND_NOTIFICATION_ID = 0x8899;
 	private Conversation mOpenConversation;
 	private boolean mIsInForeground;
 	private long mLastNotification;
@@ -290,9 +291,11 @@ public class NotificationService {
 		Intent viewConversationIntent = new Intent(mXmppConnectionService,
 				ConversationActivity.class);
 		viewConversationIntent.setAction(Intent.ACTION_VIEW);
-		viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
+		if (conversationUuid!=null) {
-				conversationUuid);
+			viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
-		viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION);
+					conversationUuid);
+			viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION);
+		}
 
 		stackBuilder.addNextIntent(viewConversationIntent);
 
@@ -304,7 +307,14 @@ public class NotificationService {
 	private PendingIntent createDeleteIntent() {
 		Intent intent = new Intent(mXmppConnectionService,
 				XmppConnectionService.class);
-		intent.setAction("clear_notification");
+		intent.setAction(XmppConnectionService.ACTION_CLEAR_NOTIFICATION);
+		return PendingIntent.getService(mXmppConnectionService, 0, intent, 0);
+	}
+
+	private PendingIntent createDisableForeground() {
+		Intent intent = new Intent(mXmppConnectionService,
+				XmppConnectionService.class);
+		intent.setAction(XmppConnectionService.ACTION_DISABLE_FOREGROUND);
 		return PendingIntent.getService(mXmppConnectionService, 0, intent, 0);
 	}
 
@@ -351,4 +361,15 @@ public class NotificationService {
 				: Config.MINI_GRACE_PERIOD * 2;
 		return SystemClock.elapsedRealtime() < (this.mLastNotification + miniGrace);
 	}
+
+	public Notification createForegroundNotification() {
+		NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService);
+		mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+		mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
+		mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_disable));
+		mBuilder.setContentIntent(createDisableForeground());
+		mBuilder.setWhen(0);
+		mBuilder.setPriority(NotificationCompat.PRIORITY_MIN);
+		return mBuilder.build();
+	}
 }

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -97,6 +97,7 @@ public class XmppConnectionService extends Service {
 
 	public static String ACTION_CLEAR_NOTIFICATION = "clear_notification";
 	private static String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts";
+	public static String ACTION_DISABLE_FOREGROUND = "disable_foreground";
 	private ContentObserver contactObserver = new ContentObserver(null) {
 		@Override
 		public void onChange(boolean selfChange) {
@@ -345,6 +346,9 @@ public class XmppConnectionService extends Service {
 				return START_NOT_STICKY;
 			} else if (intent.getAction().equals(ACTION_CLEAR_NOTIFICATION)) {
 				mNotificationService.clear();
+			} else if (intent.getAction().equals(ACTION_DISABLE_FOREGROUND)) {
+				getPreferences().edit().putBoolean("keep_foreground_service",false).commit();
+				toggleForegroundService();
 			}
 		}
 		this.wakeLock.acquire();
@@ -459,18 +463,23 @@ public class XmppConnectionService extends Service {
 		this.pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
 		this.wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
 				"XmppConnectionService");
+		toggleForegroundService();
 	}
 
-	@Override
+	public void toggleForegroundService() {
-	public void onDestroy() {
+		if (getPreferences().getBoolean("keep_foreground_service",false)) {
-		super.onDestroy();
+			startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, this.mNotificationService.createForegroundNotification());
-		this.logoutAndSave();
+		} else {
+			stopForeground(true);
+		}
 	}
 
 	@Override
 	public void onTaskRemoved(Intent rootIntent) {
 		super.onTaskRemoved(rootIntent);
-		this.logoutAndSave();
+		if (!getPreferences().getBoolean("keep_foreground_service",false)) {
+			this.logoutAndSave();
+		}
 	}
 
 	private void logoutAndSave() {

src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

@@ -70,6 +70,8 @@ public class SettingsActivity extends XmppActivity implements
 					}
 				}
 			}
+		} else if (name.equals("keep_foreground_service")) {
+			xmppConnectionService.toggleForegroundService();
 		}
 	}
 

src/main/res/values/strings.xml

@@ -328,4 +328,8 @@
     <string name="verified">Verified!</string>
     <string name="smp_requested">Contact requested SMP verification</string>
     <string name="no_otr_session_found">No valid OTR session has been found!</string>
+    <string name="conversations_foreground_service">Conversations</string>
+    <string name="touch_to_disable">Touch to disable foreground service</string>
+    <string name="pref_keep_foreground_service">Keep service in foreground</string>
+    <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
 </resources>

src/main/res/xml/preferences.xml

@@ -101,6 +101,11 @@
                     android:key="indicate_received"
                     android:summary="@string/pref_use_indicate_received_summary"
                     android:title="@string/pref_use_indicate_received" />
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="keep_foreground_service"
+                    android:title="@string/pref_keep_foreground_service"
+                    android:summary="@string/pref_keep_foreground_service_summary" />
             </PreferenceCategory>
         </PreferenceScreen>