From 3551eedb8aee1b39814858d2519e9af303439f0e Mon Sep 17 00:00:00 2001 From: geeksville Date: Wed, 22 Jan 2020 21:46:41 -0800 Subject: [PATCH] move to geeksville/mesh --- README.md | 7 ++++--- TODO.md | 1 + app/build.gradle | 2 +- app/google-services.json | 2 +- .../{meshutil => mesh}/ExampleInstrumentedTest.kt | 4 ++-- app/src/main/AndroidManifest.xml | 12 ++++++------ .../geeksville/{meshutil => mesh}/IMeshService.aidl | 6 +++--- .../{meshutil => mesh}/BootCompleteReceiver.kt | 2 +- .../geeksville/{meshutil => mesh}/MainActivity.kt | 5 +---- .../com/geeksville/{meshutil => mesh}/MeshService.kt | 2 +- .../{meshutil => mesh}/MeshUtilApplication.kt | 2 +- .../{meshutil => mesh}/SoftwareUpdateService.kt | 11 +++++------ app/src/main/proto/mesh.proto | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- .../geeksville/{meshutil => mesh}/ExampleUnitTest.kt | 2 +- 15 files changed, 30 insertions(+), 32 deletions(-) rename app/src/androidTest/java/com/geeksville/{meshutil => mesh}/ExampleInstrumentedTest.kt (83%) rename app/src/main/aidl/com/geeksville/{meshutil => mesh}/IMeshService.aidl (83%) rename app/src/main/java/com/geeksville/{meshutil => mesh}/BootCompleteReceiver.kt (91%) rename app/src/main/java/com/geeksville/{meshutil => mesh}/MainActivity.kt (97%) rename app/src/main/java/com/geeksville/{meshutil => mesh}/MeshService.kt (96%) rename app/src/main/java/com/geeksville/{meshutil => mesh}/MeshUtilApplication.kt (81%) rename app/src/main/java/com/geeksville/{meshutil => mesh}/SoftwareUpdateService.kt (97%) rename app/src/test/java/com/geeksville/{meshutil => mesh}/ExampleUnitTest.kt (90%) diff --git a/README.md b/README.md index d1ce45f0d..f0b2a4a51 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,14 @@ Questions? kevinh@geeksville.com ## Analytics setup on dev devices -adb shell setprop debug.firebase.analytics.app com.geeksville.meshutil +adb shell setprop debug.firebase.analytics.app com.geeeksville.mesh -then go here: https://console.firebase.google.com/u/0/project/meshutil/analytics/app/android:com.geeksville.meshutil/debugview~2F%3Ft=1579727535152&fpn=484268767777&swu=1&sgu=1&sus=upgraded&cs=app.m.debugview.overview&g=1 +then go here: https://console.firebase.google.com/u/0/project/meshutil/analytics/app/android:com.geeeksville.mesh/debugview~2F%3Ft=1579727535152&fpn=484268767777&swu=1&sgu=1&sus=upgraded&cs=app.m.debugview.overview&g=1 for verbose logging adb shell setprop log.tag.FA VERBOSE adb shell setprop log.tag.FA-SVC VERBOSE To see crash logs: -https://console.firebase.google.com/u/0/project/meshutil/crashlytics/app/android:com.geeksville.meshutil/issues?state=open&time=last-seven-days&type=crash +https://console.firebase.google.com/u/0/project/ +meshutil/crashlytics/app/android:com.geeeksville.mesh/issues?state=open&time=last-seven-days&type=crash diff --git a/TODO.md b/TODO.md index 47f435e4e..ae44edc42 100644 --- a/TODO.md +++ b/TODO.md @@ -6,6 +6,7 @@ * add real messaging code/protobufs * use https://codelabs.developers.google.com/codelabs/jetpack-compose-basics/#4 to show service state * connect to bluetooth device automatically using minimum power +* have signal declare receivers: https://developer.android.com/guide/components/broadcasts#manifest-declared-receivers protobuf notes protoc -I=. --java_out /tmp mesh.proto diff --git a/app/build.gradle b/app/build.gradle index 603c4263e..3211b0a5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "com.geeksville.meshutil" + applicationId "com.geeksville.mesh" minSdkVersion 21 targetSdkVersion 29 versionCode 1 diff --git a/app/google-services.json b/app/google-services.json index 053b6705e..525c238a8 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -10,7 +10,7 @@ "client_info": { "mobilesdk_app_id": "1:484268767777:android:341f38a29ecbe9b0334160", "android_client_info": { - "package_name": "com.geeksville.meshutil" + "package_name": "com.geeksville.mesh" } }, "oauth_client": [ diff --git a/app/src/androidTest/java/com/geeksville/meshutil/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/com/geeksville/meshutil/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt index c990717b8..64799310d 100644 --- a/app/src/androidTest/java/com/geeksville/meshutil/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.geeksville.meshutil", appContext.packageName) + assertEquals("com.geeksville.com.geeeksville.mesh", appContext.packageName) } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3d4e6b747..9643c683a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -31,7 +31,7 @@ android:required="true" /> @@ -65,7 +65,7 @@ - + diff --git a/app/src/main/aidl/com/geeksville/meshutil/IMeshService.aidl b/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl similarity index 83% rename from app/src/main/aidl/com/geeksville/meshutil/IMeshService.aidl rename to app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl index 848da6299..fb5640d96 100644 --- a/app/src/main/aidl/com/geeksville/meshutil/IMeshService.aidl +++ b/app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl @@ -1,5 +1,5 @@ -// com.geeksville.meshutil.IMeshService.aidl -package com.geeksville.meshutil; +// com.geeksville.com.geeeksville.mesh.IMeshService.aidl +package com.geeksville.mesh; // Declare any non-default types here with import statements @@ -24,7 +24,7 @@ interface IMeshService { */ boolean isConnected(); - // see com.geeksville.meshutil broadcast intents + // see com.geeksville.com.geeeksville.mesh broadcast intents // RECEIVED_OPAQUE for data received from other nodes // NODE_CHANGE for new IDs appearing or disappearing // CONNECTION_CHANGED for losing/gaining connection to the packet radio diff --git a/app/src/main/java/com/geeksville/meshutil/BootCompleteReceiver.kt b/app/src/main/java/com/geeksville/mesh/BootCompleteReceiver.kt similarity index 91% rename from app/src/main/java/com/geeksville/meshutil/BootCompleteReceiver.kt rename to app/src/main/java/com/geeksville/mesh/BootCompleteReceiver.kt index f5cfbb442..3c88575c1 100644 --- a/app/src/main/java/com/geeksville/meshutil/BootCompleteReceiver.kt +++ b/app/src/main/java/com/geeksville/mesh/BootCompleteReceiver.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import android.content.BroadcastReceiver import android.content.Context diff --git a/app/src/main/java/com/geeksville/meshutil/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt similarity index 97% rename from app/src/main/java/com/geeksville/meshutil/MainActivity.kt rename to app/src/main/java/com/geeksville/mesh/MainActivity.kt index 9bfb5036e..0d27eff4b 100644 --- a/app/src/main/java/com/geeksville/meshutil/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import android.Manifest import android.bluetooth.* @@ -6,9 +6,6 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle -import android.os.Handler -import android.util.Log -import com.google.android.material.snackbar.Snackbar import androidx.appcompat.app.AppCompatActivity import android.view.Menu import android.view.MenuItem diff --git a/app/src/main/java/com/geeksville/meshutil/MeshService.kt b/app/src/main/java/com/geeksville/mesh/MeshService.kt similarity index 96% rename from app/src/main/java/com/geeksville/meshutil/MeshService.kt rename to app/src/main/java/com/geeksville/mesh/MeshService.kt index 534d696c9..69b75827a 100644 --- a/app/src/main/java/com/geeksville/meshutil/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/MeshService.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import android.app.Service import android.content.Intent diff --git a/app/src/main/java/com/geeksville/meshutil/MeshUtilApplication.kt b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt similarity index 81% rename from app/src/main/java/com/geeksville/meshutil/MeshUtilApplication.kt rename to app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt index eb1a28c76..993e7c643 100644 --- a/app/src/main/java/com/geeksville/meshutil/MeshUtilApplication.kt +++ b/app/src/main/java/com/geeksville/mesh/MeshUtilApplication.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import com.geeksville.android.GeeksvilleApplication diff --git a/app/src/main/java/com/geeksville/meshutil/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/SoftwareUpdateService.kt similarity index 97% rename from app/src/main/java/com/geeksville/meshutil/SoftwareUpdateService.kt rename to app/src/main/java/com/geeksville/mesh/SoftwareUpdateService.kt index fe7d84bf4..23d2471db 100644 --- a/app/src/main/java/com/geeksville/meshutil/SoftwareUpdateService.kt +++ b/app/src/main/java/com/geeksville/mesh/SoftwareUpdateService.kt @@ -1,4 +1,4 @@ -package com.geeksville.meshutil +package com.geeksville.mesh import android.bluetooth.* import android.bluetooth.le.* @@ -8,7 +8,6 @@ import android.os.Handler import android.os.ParcelUuid import android.os.SystemClock import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity import androidx.core.app.JobIntentService import com.geeksville.android.Logging import java.io.InputStream @@ -248,10 +247,10 @@ class SoftwareUpdateService : JobIntentService(), Logging { */ const val JOB_ID = 1000 - val scanDevicesIntent = Intent("com.geeksville.meshutil.SCAN_DEVICES") - val startUpdateIntent = Intent("com.geeksville.meshutil.START_UPDATE") - private val sendNextBlockIntent = Intent("com.geeksville.meshutil.SEND_NEXT_BLOCK") - private val finishUpdateIntent = Intent("com.geeksville.meshutil.FINISH_UPDATE") + val scanDevicesIntent = Intent("com.geeksville.com.geeeksville.mesh.SCAN_DEVICES") + val startUpdateIntent = Intent("com.geeksville.com.geeeksville.mesh.START_UPDATE") + private val sendNextBlockIntent = Intent("com.geeksville.com.geeeksville.mesh.SEND_NEXT_BLOCK") + private val finishUpdateIntent = Intent("com.geeksville.com.geeeksville.mesh.FINISH_UPDATE") private const val SCAN_PERIOD: Long = 10000 diff --git a/app/src/main/proto/mesh.proto b/app/src/main/proto/mesh.proto index 23bf380b0..a9859d607 100644 --- a/app/src/main/proto/mesh.proto +++ b/app/src/main/proto/mesh.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package mesh; -option java_package = "com.geeksville.meshutil"; +option java_package = "com.geeksville.com.geeeksville.mesh"; option java_outer_classname = "MeshProtos"; /** diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index df05296e5..fd501d91d 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,7 +1,7 @@ + tools:context="com.geeksville.mesh.MainActivity">