Merge pull request google#462 from cco3/oncreate

[android] Handle scanning startup in onCreate
meteoritt · Jul 8, 2015 · 44aafb4 · 44aafb4
2 parents 49becea + e2d27c2
commit 44aafb4
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/PwoDiscoveryService.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/PwoDiscoveryService.java
@@ -147,14 +147,13 @@ private void initialize() {
   public void onCreate() {
     super.onCreate();
     initialize();
-  }
 
-  @Override
-  @SuppressWarnings("deprecation")
-  public int onStartCommand(Intent intent, int flags, int startId) {
-    startSearchingForPwos();
-    //make sure the service keeps running
-    return START_STICKY;
+    mScanStartTime = new Date().getTime();
+    mHandler.postDelayed(mFirstScanTimeout, FIRST_SCAN_TIME_MILLIS);
+    mHandler.postDelayed(mSecondScanTimeout, SECOND_SCAN_TIME_MILLIS);
+    for (PwoDiscoverer pwoDiscoverer : mPwoDiscoverers) {
+      pwoDiscoverer.startScan();
+    }
   }
 
   @Override
@@ -181,7 +180,12 @@ public void onRebind(Intent intent) {
   @Override
   public void onDestroy() {
     Log.d(TAG, "onDestroy:  service exiting");
-    stopSearchingForPwos();
+    mHandler.removeCallbacks(mFirstScanTimeout);
+    mHandler.removeCallbacks(mSecondScanTimeout);
+    for (PwoDiscoverer pwoDiscoverer : mPwoDiscoverers) {
+      pwoDiscoverer.stopScan();
+    }
+
     super.onDestroy();
   }
 
@@ -232,27 +236,6 @@ public void onPwoDiscovered(PwoMetadata pwoMetadata) {
     }
   }
 
-  private void startSearchingForPwos() {
-    if (mScanStartTime != 0) {
-      return;
-    }
-
-    mScanStartTime = new Date().getTime();
-    mHandler.postDelayed(mFirstScanTimeout, FIRST_SCAN_TIME_MILLIS);
-    mHandler.postDelayed(mSecondScanTimeout, SECOND_SCAN_TIME_MILLIS);
-    for (PwoDiscoverer pwoDiscoverer : mPwoDiscoverers) {
-      pwoDiscoverer.startScan();
-    }
-  }
-
-  private void stopSearchingForPwos() {
-    mHandler.removeCallbacks(mFirstScanTimeout);
-    mHandler.removeCallbacks(mSecondScanTimeout);
-    for (PwoDiscoverer pwoDiscoverer : mPwoDiscoverers) {
-      pwoDiscoverer.stopScan();
-    }
-  }
-
   /**
    * Create a new set of notifications or update those existing.
    */