test playstore upload

.gitignore

@@ -12,3 +12,4 @@
 /captures
 .externalNativeBuild
 .cxx
+/app/release

TODO.md

@@ -1,8 +1,7 @@
 # High priority
 MVP features required for first public alpha 
 
-* use google signin to get user name (later give other options)
+* let user set name and shortname
-* always set a _unique_ owner id (if changed)
 * stop scan when we start the service
 * set the radio by using the service
 * startforegroundservice only if we have a valid radio
@@ -52,6 +51,8 @@ Do this "Signal app compatible" release relatively soon after the alpha release
 # Medium priority
 Things for the betaish period.
 
+* use google signin to get user name 
+* use Firebase Test Lab
 * let user pick/specify a name through ways other than google signin (for the privacy concerned, or devices without Play API)
 * make my android app show mesh state
 * show qr code for each channel https://medium.com/@aanandshekharroy/generate-barcode-in-android-app-using-zxing-64c076a5d83a
@@ -114,3 +115,4 @@ Don't leave device discoverable.  Don't let unpaired users do things with device
 * all chat in the app defaults to group chat
 * start bt receive on boot
 * warn user to bt pair
+* suppress logging output if running a release build (required for play store)

app/build.gradle

@@ -14,10 +14,10 @@ android {
     buildToolsVersion "29.0.2"
     defaultConfig {
         applicationId "com.geeksville.mesh"
-        minSdkVersion 21
+        minSdkVersion 22 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 1
+        versionCode 2
-        versionName "1.0"
+        versionName "0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -99,6 +99,9 @@ dependencies {
     androidTestImplementation("androidx.ui:ui-platform:$compose_version")
     androidTestImplementation("androidx.ui:ui-test:$compose_version")
 
+    // For Google Sign-In (owner name accesss)
+    implementation 'com.google.android.gms:play-services-auth:17.0.0'
+
     // Add the Firebase SDK for Crashlytics.
     implementation 'com.google.firebase:firebase-crashlytics:17.0.0-beta01'
 

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -20,6 +20,11 @@ import com.geeksville.mesh.ui.MeshApp
 import com.geeksville.mesh.ui.TextMessage
 import com.geeksville.mesh.ui.UIState
 import com.geeksville.util.exceptionReporter
+import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.tasks.Task
 import java.nio.charset.Charset
 import java.util.*
 
@@ -30,12 +35,12 @@ class MainActivity : AppCompatActivity(), Logging,
     companion object {
         const val REQUEST_ENABLE_BT = 10
         const val DID_REQUEST_PERM = 11
+        const val RC_SIGN_IN = 12 // google signin completed
     }
 
 
     private val utf8 = Charset.forName("UTF-8")
 
-
     private val bluetoothAdapter: BluetoothAdapter? by lazy(LazyThreadSafetyMode.NONE) {
         val bluetoothManager = getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
         bluetoothManager.adapter
@@ -93,9 +98,6 @@ class MainActivity : AppCompatActivity(), Logging,
 
 
     private fun setOwner() {
-        try {
-
-
         // Note: we are careful to not set a new unique ID
         meshService!!.setOwner(null, "Kevin Xter", "kx")
     }
@@ -140,6 +142,18 @@ class MainActivity : AppCompatActivity(), Logging,
         }
 
         requestPermission()
+
+        // Configure sign-in to request the user's ID, email address, and basic
+// profile. ID and basic profile are included in DEFAULT_SIGN_IN.
+        // Configure sign-in to request the user's ID, email address, and basic
+// profile. ID and basic profile are included in DEFAULT_SIGN_IN.
+        val gso =
+            GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestEmail()
+                .build()
+
+        // Build a GoogleSignInClient with the options specified by gso.
+        UIState.googleSignInClient = GoogleSignIn.getClient(this, gso);
     }
 
     override fun onDestroy() {
@@ -147,6 +161,36 @@ class MainActivity : AppCompatActivity(), Logging,
         super.onDestroy()
     }
 
+    /**
+     * Dispatch incoming result to the correct fragment.
+     */
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+
+        // Result returned from launching the Intent from GoogleSignInClient.getSignInIntent(...);
+        // Result returned from launching the Intent from GoogleSignInClient.getSignInIntent(...);
+        if (requestCode === RC_SIGN_IN) {
+            // The Task returned from this call is always completed, no need to attach
+            // a listener.
+            val task: Task<GoogleSignInAccount> =
+                GoogleSignIn.getSignedInAccountFromIntent(data)
+            handleSignInResult(task)
+        }
+    }
+
+    private fun handleSignInResult(completedTask: Task<GoogleSignInAccount>) {
+        try {
+            val account =
+                completedTask.getResult(ApiException::class.java)
+            // Signed in successfully, show authenticated UI.
+            //updateUI(account)
+        } catch (e: ApiException) { // The ApiException status code indicates the detailed failure reason.
+// Please refer to the GoogleSignInStatusCodes class reference for more information.
+            warn("signInResult:failed code=" + e.statusCode)
+            //updateUI(null)
+        }
+    }
+
     private var receiverRegistered = false
 
     private fun registerMeshReceiver() {

app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt

@@ -2,6 +2,7 @@ package com.geeksville.mesh
 
 import android.os.Debug
 import com.geeksville.android.GeeksvilleApplication
+import com.geeksville.android.Logging
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 
@@ -10,6 +11,8 @@ class MeshUtilApplication : GeeksvilleApplication(null, "58e72ccc361883ea502510b
     override fun onCreate() {
         super.onCreate()
 
+        Logging.showLogs = BuildConfig.DEBUG
+
         // We default to off in the manifest, FIXME turn on only if user approves
         // leave off when running in the debugger
         if (false && !Debug.isDebuggerConnected())

app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt

@@ -36,6 +36,22 @@ fun HomeContent() {
             Text("Text: ${it.text}")
         }
 
+        /* FIXME - doens't work yet - probably because I'm not using release keys
+        // If account is null, then show the signin button, otherwise
+        val context = ambient(ContextAmbient)
+        val account = GoogleSignIn.getLastSignedInAccount(context)
+        if (account != null)
+            Text("We have an account")
+        else {
+            Text("No account yet")
+            if (context is Activity) {
+                Button("Google sign-in", onClick = {
+                    val signInIntent: Intent = UIState.googleSignInClient.signInIntent
+                    context.startActivityForResult(signInIntent, MainActivity.RC_SIGN_IN)
+                })
+            }
+        } */
+
         /*
         Button(text = "Start scan",
             onClick = {

app/src/main/java/com/geeksville/mesh/ui/Status.kt

@@ -5,6 +5,7 @@ import androidx.compose.mutableStateOf
 import com.geeksville.mesh.MeshUser
 import com.geeksville.mesh.NodeInfo
 import com.geeksville.mesh.Position
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import java.util.*
 
 // defines the screens we have in the app
@@ -23,6 +24,9 @@ data class TextMessage(val date: Date, val from: String, val text: String)
 /// FIXME - figure out how to merge this staate with the AppStatus Model
 object UIState {
 
+    /// Kinda ugly - created in the activity but used from Compose - figure out if there is a cleaner way GIXME
+    lateinit var googleSignInClient: GoogleSignInClient
+
     private val testPositions = arrayOf(
         Position(32.776665, -96.796989, 35), // dallas
         Position(32.960758, -96.733521, 35), // richardson