meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #343 from meshtastic/release

Browse source 
1.2.53
This commit is contained in:
Jm Casler 2022-01-10 13:26:58 -08:00 • committed by GitHub
commit 85657ca634
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View file

@ -12,9 +12,6 @@
android:name="android.hardware.location.gps"
android:required="false" />
<!-- per https://github.com/journeyapps/zxing-android-embedded to force support for build 22 -->
<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

7
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -7,6 +7,7 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.IBinder
import android.os.Looper
import android.os.RemoteException
import android.widget.Toast
import androidx.annotation.UiThread
@ -196,6 +197,7 @@ class MeshService : Service(), Logging {
* start our location requests (if they weren't already running)
*
* per https://developer.android.com/training/location/change-location-settings
* & https://developer.android.com/training/location/request-updates
*/
@SuppressLint("MissingPermission")
@UiThread
@ -253,10 +255,7 @@ class MeshService : Service(), Logging {
}
val client = LocationServices.getFusedLocationProviderClient(this)
// FIXME - should we use Looper.myLooper() in the third param per https://github.com/android/location-samples/blob/432d3b72b8c058f220416958b444274ddd186abd/LocationUpdatesForegroundService/app/src/main/java/com/google/android/gms/location/sample/locationupdatesforegroundservice/LocationUpdatesService.java
client.requestLocationUpdates(request, locationCallback, null)
client.requestLocationUpdates(request, locationCallback, Looper.getMainLooper())
fusedLocationClient = client
}
}

1
app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
View file

@ -211,6 +211,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
binding.scanButton.setOnClickListener {
if ((requireActivity() as MainActivity).hasCameraPermission()) {
debug("Starting QR code scanner")
val zxingScan = IntentIntegrator.forSupportFragment(this)
zxingScan.setCameraId(0)
zxingScan.setPrompt("")

2
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -878,7 +878,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
locationSettingsResponse.addOnSuccessListener {
if (!it.locationSettingsStates.isBleUsable || !it.locationSettingsStates.isLocationUsable)
if (!it.locationSettingsStates?.isBleUsable!! || !it.locationSettingsStates?.isLocationUsable!!)
weNeedAccess()
else
debug("We have location access")

2
app/src/main/res/values-sk/strings.xml
View file

@ -63,7 +63,6 @@
<string name="rate_dialog_cancel_en">Pripomenúť neskôr</string>
<string name="rate_dialog_ok_en">Ohodnotiť teraz</string>
<string name="rate_dialog_title_en">Ohodnoťte Meshtastic</string>
<string name="connected">Pripojené k vysielaču</string>
<string name="modem_config_short">Krátky dosah / Rýchle</string>
<string name="modem_config_medium">Stredný dosah / Rýchle</string>
<string name="modem_config_long">Dlhý dosah / Rýchle</string>
@ -104,7 +103,6 @@
<string name="are_you_shure_change_default">Ste si istý, že chcete preladiť na základný (default) kanál?</string>
<string name="cant_change_no_radio">Nie je možné zmeniť kanál, pretože vysielač ešte nie je pripojený. Skúste to neskôr.</string>
<string name="firmware_old">Firmvér vysielača je príliš zastaralý, aby dokázal komunikovať s aplikáciou. Prosím choďte na panel nastavení a zvoľte možnosť \"Aktualizácia firmvéru\". Viac informácií nájdete na <a href="https://github.com/meshtastic/Meshtastic-device#firmware-installation">našom sprievodcovi inštaláciou firmvéru</a> na Github-e.</string>
<string name="apply">Použiť</string>
<string name="no_app_found">Aplikácia pre odoslanie URL nebola nájdená</string>
<string name="theme">Téma</string>
<string name="theme_light">Svetlá</string>