summaryrefslogtreecommitdiff
path: root/same-android
diff options
context:
space:
mode:
Diffstat (limited to 'same-android')
-rw-r--r--same-android/AndroidManifest.xml2
-rw-r--r--same-android/src/main/java/com/orbekk/SameControllerActivity.java (renamed from same-android/src/main/java/com/orbekk/HelloAndroidActivity.java)2
-rw-r--r--same-android/src/main/java/com/orbekk/discovery/SameService.java1
3 files changed, 3 insertions, 2 deletions
diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml
index b950f44..339fb73 100644
--- a/same-android/AndroidManifest.xml
+++ b/same-android/AndroidManifest.xml
@@ -10,7 +10,7 @@
<application
android:icon="@drawable/icon"
android:label="@string/app_name" >
- <activity android:name=".HelloAndroidActivity" >
+ <activity android:name=".SameControllerActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
index 090d719..975a1df 100644
--- a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java
+++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java
@@ -15,7 +15,7 @@ import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
-public class HelloAndroidActivity extends Activity {
+public class SameControllerActivity extends Activity {
private Logger logger = LoggerFactory.getLogger(getClass());
public void createNetwork(View unused) {
diff --git a/same-android/src/main/java/com/orbekk/discovery/SameService.java b/same-android/src/main/java/com/orbekk/discovery/SameService.java
index 900c7c8..44f0013 100644
--- a/same-android/src/main/java/com/orbekk/discovery/SameService.java
+++ b/same-android/src/main/java/com/orbekk/discovery/SameService.java
@@ -80,6 +80,7 @@ public class SameService extends Service {
discoveryThread = new DiscoveryThread(sameController.getClient());
discoveryThread.start();
}
+
}
}