diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index a81aeebad8febddce1759c1e8dabbf8405e7ec9b..55dd04a54002e0ed45b58f70d12b6dd65ea604fa 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -17,10 +17,10 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" > <service - android:name=".android.helloworld.HelloWorldService" + android:name=".android.BriarService" android:exported="false" > <intent-filter> - <action android:name="net.sf.briar.android.helloworld.HelloWorldService" /> + <action android:name="net.sf.briar.android.BriarService" /> </intent-filter> </service> <activity diff --git a/briar-android/libs/android-support-v4.jar b/briar-android/libs/android-support-v4.jar new file mode 100644 index 0000000000000000000000000000000000000000..6080877d4ade158f24ad7ccd9a10db2ac9060b47 Binary files /dev/null and b/briar-android/libs/android-support-v4.jar differ diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index 351de82417bf3208b89cf3f29ea3b7fd283d6b6d..6cb529c8fd2df76fec26668f320e2abb115aeca1 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Briar</string> + <string name="notification_title">FIXME: Notification title</string> + <string name="notification_text">FIXME: Notification text</string> <string name="welcome">Welcome to Briar! Add a contact to get started.</string> <string name="face_to_face">For security reasons you must be face to face with someone to add them as a contact.</string> <string name="add_contact_button">Add a contact</string> diff --git a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldService.java b/briar-android/src/net/sf/briar/android/BriarService.java similarity index 81% rename from briar-android/src/net/sf/briar/android/helloworld/HelloWorldService.java rename to briar-android/src/net/sf/briar/android/BriarService.java index ed00b062594f9f4f5aad2d56b4b57ab937c233cb..d2aff0514a4b7806dac69308b0be361538b1193d 100644 --- a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldService.java +++ b/briar-android/src/net/sf/briar/android/BriarService.java @@ -1,4 +1,4 @@ -package net.sf.briar.android.helloworld; +package net.sf.briar.android; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; @@ -6,6 +6,7 @@ import static java.util.logging.Level.WARNING; import java.io.IOException; import java.util.logging.Logger; +import net.sf.briar.R; import net.sf.briar.api.crypto.KeyManager; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; @@ -13,13 +14,14 @@ import net.sf.briar.api.plugins.PluginManager; import roboguice.service.RoboService; import android.content.Intent; import android.os.IBinder; +import android.support.v4.app.NotificationCompat; import com.google.inject.Inject; -public class HelloWorldService extends RoboService { +public class BriarService extends RoboService { private static final Logger LOG = - Logger.getLogger(HelloWorldService.class.getName()); + Logger.getLogger(BriarService.class.getName()); @Inject private DatabaseComponent db; @Inject private KeyManager keyManager; @@ -29,6 +31,13 @@ public class HelloWorldService extends RoboService { public void onCreate() { super.onCreate(); if(LOG.isLoggable(INFO)) LOG.info("Created"); + NotificationCompat.Builder b = new NotificationCompat.Builder(this); + b.setSmallIcon(R.drawable.notification_icon); + b.setContentTitle(getText(R.string.notification_title)); + b.setContentText(getText(R.string.notification_text)); + b.setOngoing(true); + startForeground(1, b.build()); + if(LOG.isLoggable(INFO)) LOG.info("Running in the foreground"); new Thread() { @Override public void run() { @@ -45,7 +54,6 @@ public class HelloWorldService extends RoboService { @Override public IBinder onBind(Intent intent) { - if(LOG.isLoggable(INFO)) LOG.info("Bound"); return null; } diff --git a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldActivity.java b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldActivity.java index 98f9e52d5cb3c330dcae30e33d20f43883acc9ab..afa9c32e8d348496a153215b2a0fe2a3c050db0c 100644 --- a/briar-android/src/net/sf/briar/android/helloworld/HelloWorldActivity.java +++ b/briar-android/src/net/sf/briar/android/helloworld/HelloWorldActivity.java @@ -9,6 +9,7 @@ import static java.util.logging.Level.INFO; import java.util.logging.Logger; import net.sf.briar.R; +import net.sf.briar.android.BriarService; import net.sf.briar.android.invitation.AddContactActivity; import roboguice.activity.RoboActivity; import android.content.Intent; @@ -56,7 +57,7 @@ implements OnClickListener { setContentView(layout); - startService(new Intent(HelloWorldService.class.getName())); + startService(new Intent(BriarService.class.getName())); } @Override