asd

README.md

@@ -0,0 +1,5 @@
+# Smart Security
+
+For documentations read projectReport.pdf.
+
+To see screenshots of the application see appScreenshots.png

app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.proseminar.smartsecurity"
-        minSdkVersion 15
+        minSdkVersion 18
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"

app/src/main/AndroidManifest.xml

@@ -11,14 +11,16 @@
     -->
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:label="@string/app_name"
         android:theme="@style/AppTheme.NoActionBar">
         <activity
             android:name=".InfoActivity"
             android:allowBackup="true"
-            android:icon="@mipmap/smartlogo"
+            android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:supportsRtl="true">
             <intent-filter>
@@ -28,8 +30,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".SettingsActivity" />
-        <activity android:name=".AlarmOnActivity" />
-        <activity android:name=".MainActivity" />
+        <activity android:name=".AlarmOnActivity"
+            android:screenOrientation="portrait"/>
         <activity android:name=".SensorListActivity" />
 
 

app/src/main/aidl/com/proseminar/smartsecurity/SensorDataCollectorApi.aidl

@@ -4,6 +4,7 @@ package com.proseminar.smartsecurity;
 // Declare any non-default types here with import statements
 import com.proseminar.smartsecurity.SensorDataUpdateResult;
 import com.proseminar.smartsecurity.SensorDataCollectorListener;
+import android.bluetooth.BluetoothDevice;
 
 interface SensorDataCollectorApi {
 
@@ -14,4 +15,8 @@ interface SensorDataCollectorApi {
 	void addListener(SensorDataCollectorListener listener);
 
 	void removeListener(SensorDataCollectorListener listener);
+
+	void addBluetoothConnection(String s);
+
+	void removeBluetoothConnection(String s);
 }

app/src/main/java/com/proseminar/smartsecurity/AlarmOnActivity.java

@@ -5,11 +5,11 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -38,6 +38,8 @@ public class AlarmOnActivity extends AppCompatActivity {
     // Count down timers
     private CountDownTimer turnOnTimer;
 
+    Resources res;
+
     private SensorDataCollectorApi api;
 
     private SensorDataCollectorListener.Stub collectorListener = new SensorDataCollectorListener.Stub() {
@@ -76,7 +78,6 @@ protected void onCreate(Bundle savedInstanceState) {
         currentStatus = mPrefs.getBoolean(KEY, OFF);
         updater = mPrefs.edit();
 
-        Log.e(TAG, "+++++++++++++++ ON CREATE");
         // Set different layouts depending on the status of the alarm.
         if (currentStatus) {
             setContentView(R.layout.activity_alarm_on);
@@ -86,13 +87,15 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         initButton();
 
+        res = getResources();
+        final int countDownMiliSeconds = res.getInteger(R.integer.ui_alarm_on_countdown);
+
         if (!currentStatus) {
             // Timer counting down the time until the alarm gets turned on (30 000)
-            turnOnTimer = new CountDownTimer(2000, 1000) {
+            turnOnTimer = new CountDownTimer(countDownMiliSeconds, 1000) {
 
                 public void onTick(long millisUntilFinished) {
                     tvSeconds.setText(Integer.toString((int) (millisUntilFinished / 1000)));
-                    Log.e("STOP", "click");
                 }
 
                 // The timer is over the alarm turns on.
@@ -116,11 +119,23 @@ protected void onResume() {
             turnOnTimer.start();
         }
 
-        Intent intent = new Intent(SensorDataCollectorService.class.getName());
+        Intent intent;
+        int currentapiVersion = android.os.Build.VERSION.SDK_INT;
+        if (currentapiVersion >= android.os.Build.VERSION_CODES.LOLLIPOP){
+            // Do something for lollipop and above versions
+
+            intent = new Intent(SensorDataCollectorService.class.getCanonicalName());
+            // This is the key line that fixed everything for me
+            intent.setPackage("com.proseminar.smartsecurity");
+        } else{
+            // do something for phones running an SDK before lollipop
+
+            intent = new Intent(SensorDataCollectorService.class.getName());
+        }
         // start the service explicitly.
         // otherwise it will only run while the IPC connection is up.
         this.startService(intent);
-        bindService(intent, serviceConnection, 0);
+        this.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
     }
 
     @Override
@@ -135,7 +150,6 @@ protected void onPause() {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        Log.e(TAG, "+++++++++++++++DSTRY");
         if (!(turnOnTimer == null)) {
             turnOnTimer.cancel();
         }