msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Updated Android car

Browse Source
pull/212/head
M66B 2 years ago
parent 374691c6a8
commit d8d44c3b59
3 changed files with 130 additions and 107 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape View File

@ -711,7 +711,7 @@ dependencies {
implementation "com.github.seancfoley:ipaddress:$ipaddress_version" implementation "com.github.seancfoley:ipaddress:$ipaddress_version"
// https://mvnrepository.com/artifact/androidx.car.app/app?repo=google // https://mvnrepository.com/artifact/androidx.car.app/app?repo=google
// implementation "androidx.car.app:app:1.2.0-rc01" // implementation "androidx.car.app:app:1.4.0-alpha01"
// https://github.com/square/leakcanary // https://github.com/square/leakcanary
// https://square.github.io/leakcanary/getting_started/ // https://square.github.io/leakcanary/getting_started/

40
app/src/main/java/androidx/car/app/connection/CarConnection.java
Unescape View File

@ -1,4 +1,4 @@
/* /*
* Copyright 2021 The Android Open Source Project * Copyright 2021 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -14,29 +14,30 @@
* limitations under the License. * limitations under the License.
*/ */
package androidx.car.app.connection; package androidx.car.app.connection;
import static androidx.annotation.RestrictTo.Scope.LIBRARY; import static androidx.annotation.RestrictTo.Scope.LIBRARY;
//import static androidx.car.app.utils.CommonUtils.isAutomotiveOS; //import static androidx.car.app.utils.CommonUtils.isAutomotiveOS;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import android.content.Context; import android.content.Context;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.NonNull; import androidx.annotation.MainThread;
import androidx.annotation.RestrictTo; import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData; import androidx.annotation.RestrictTo;
import androidx.lifecycle.LiveData;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /**
* A class that allows retrieval of information about connection to a car head unit. * A class that allows retrieval of information about connection to a car head unit.
*/ */
public final class CarConnection { public final class CarConnection {
/** /**
* Defines current car connection state. * Defines current car connection state.
* *
@ -85,11 +86,10 @@
* *
* @throws NullPointerException if {@code context} is {@code null} * @throws NullPointerException if {@code context} is {@code null}
*/ */
@MainThread
public CarConnection(@NonNull Context context) { public CarConnection(@NonNull Context context) {
requireNonNull(context); requireNonNull(context);
mConnectionTypeLiveData = /*isAutomotiveOS(context) mConnectionTypeLiveData = new CarConnectionTypeLiveData(context);
? new AutomotiveCarConnectionTypeLiveData()
:*/ new CarConnectionTypeLiveData(context);
} }
/** /**
@ -109,4 +109,4 @@
public LiveData<@ConnectionType Integer> getType() { public LiveData<@ConnectionType Integer> getType() {
return mConnectionTypeLiveData; return mConnectionTypeLiveData;
} }
} }

41
app/src/main/java/androidx/car/app/connection/CarConnectionTypeLiveData.java
Unescape View File

@ -18,7 +18,7 @@ package androidx.car.app.connection;
import static androidx.car.app.connection.CarConnection.ACTION_CAR_CONNECTION_UPDATED; import static androidx.car.app.connection.CarConnection.ACTION_CAR_CONNECTION_UPDATED;
import static androidx.car.app.connection.CarConnection.CAR_CONNECTION_STATE; import static androidx.car.app.connection.CarConnection.CAR_CONNECTION_STATE;
//import static androidx.car.app.utils.LogTags.TAG_CONNECTION_TO_CAR; import static androidx.car.app.utils.LogTags.TAG_CONNECTION_TO_CAR;
import android.content.AsyncQueryHandler; import android.content.AsyncQueryHandler;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@ -28,8 +28,11 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.util.Log; import android.util.Log;
import androidx.annotation.DoNotInline;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.car.app.connection.CarConnection.ConnectionType; import androidx.car.app.connection.CarConnection.ConnectionType;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
@ -60,8 +63,15 @@ final class CarConnectionTypeLiveData extends LiveData<@ConnectionType Integer>
@Override @Override
public void onActive() { public void onActive() {
mContext.registerReceiver(mBroadcastReceiver, // TODO(b/240576633): Replace this entire if-block with a call to
new IntentFilter(ACTION_CAR_CONNECTION_UPDATED)); // ContextCompat#registerReceiver once it's released in androidx.core
IntentFilter filter = new IntentFilter(ACTION_CAR_CONNECTION_UPDATED);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
Api33Impl.registerExportedReceiver(mContext, mBroadcastReceiver, filter);
} else {
mContext.registerReceiver(mBroadcastReceiver, filter);
}
queryForState(); queryForState();
} }
@ -86,23 +96,23 @@ final class CarConnectionTypeLiveData extends LiveData<@ConnectionType Integer>
@Override @Override
protected void onQueryComplete(int token, Object cookie, Cursor response) { protected void onQueryComplete(int token, Object cookie, Cursor response) {
if (response == null) { if (response == null) {
//Log.w(TAG_CONNECTION_TO_CAR, "Null response from content provider when checking " Log.w(TAG_CONNECTION_TO_CAR, "Null response from content provider when checking "
// + "connection to the car, treating as disconnected"); + "connection to the car, treating as disconnected");
postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED); postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED);
return; return;
} }
int carConnectionTypeColumn = response.getColumnIndex(CAR_CONNECTION_STATE); int carConnectionTypeColumn = response.getColumnIndex(CAR_CONNECTION_STATE);
if (carConnectionTypeColumn < 0) { if (carConnectionTypeColumn < 0) {
//Log.e(TAG_CONNECTION_TO_CAR, "Connection to car response is missing the " Log.e(TAG_CONNECTION_TO_CAR, "Connection to car response is missing the "
// + "connection type, treating as disconnected"); + "connection type, treating as disconnected");
postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED); postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED);
return; return;
} }
if (!response.moveToNext()) { if (!response.moveToNext()) {
//Log.e(TAG_CONNECTION_TO_CAR, "Connection to car response is empty, treating as " Log.e(TAG_CONNECTION_TO_CAR, "Connection to car response is empty, treating as "
// + "disconnected"); + "disconnected");
postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED); postValue(CarConnection.CONNECTION_TYPE_NOT_CONNECTED);
return; return;
} }
@ -117,4 +127,17 @@ final class CarConnectionTypeLiveData extends LiveData<@ConnectionType Integer>
queryForState(); queryForState();
} }
} }
@RequiresApi(33)
static class Api33Impl {
private Api33Impl() {
// Not instantiable
}
@DoNotInline
static void registerExportedReceiver(Context context, BroadcastReceiver broadcastReceiver,
IntentFilter intentFilter) {
context.registerReceiver(broadcastReceiver, intentFilter, Context.RECEIVER_EXPORTED);
}
}
} }

Write Preview
Loading…
Cancel
Save