From 204381d03791b6aa5517f492d2faf85b6292000d Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Wed, 8 Jun 2016 14:34:19 -0400
Subject: [PATCH] Fix lifecycle management

Apparently onPause/onResume are less useful to us than I thought.
---
 .../acmetensortoys/watchviz/MainActivity.java | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java b/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
index 25d77f5..9c8a35c 100644
--- a/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
+++ b/app/src/main/java/com/acmetensortoys/watchviz/MainActivity.java
@@ -285,29 +285,29 @@ public class MainActivity extends WearableActivity
     public void onStart() {
         Log.d("onStart", "top");
         super.onStart();
+
+        // Ask once at startup
+        if(checkSelfPermission(Manifest.permission.RECORD_AUDIO)
+                != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, 1);
+        } else {
+            createSurface();
+        }
     }
 
     @Override
     public void onResume() {
         Log.d("onResume", "top");
         super.onResume();
-
-        if(checkSelfPermission(Manifest.permission.RECORD_AUDIO)
-                == PackageManager.PERMISSION_GRANTED) {
-            createSurface();
-        } else {
-            requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, 1);
-        }
     }
 
     @Override
     public void onRequestPermissionsResult(int rq, @NonNull String[] ps, @NonNull int[] rs) {
         if(rq == 1) {
-            if (rs[0] == 1) {
+            if (rs[0] == PackageManager.PERMISSION_GRANTED) {
                 createSurface();
             } else {
-                //TODO: Something else
-                throw new RuntimeException("asdf");
+                mDebugView.setText("No audio");
             }
         }
     }
@@ -349,13 +349,13 @@ public class MainActivity extends WearableActivity
     @Override
     public void onPause() {
         Log.d("onPause", "top");
-        removeSurface();
         super.onPause();
     }
 
     @Override
     public void onStop() {
         Log.d("onStop", "top");
+        removeSurface();
         super.onStop();
     }
 
-- 
2.50.1