Skip to content

fix: [BOUNTY] WearOS Support [$1340] #3466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asiokun wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −6
Open

fix: [BOUNTY] WearOS Support [$1340] #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...es-core/src/main/kotlin/com/google/android/gms/wearable/consent/TermsOfServiceActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class TermsOfServiceActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setResult(RESULT_CANCELED)
// microG does not require the user to accept a Terms of Service to pair a WearOS device.
setResult(RESULT_OK)
finish()
}
}
18 changes: 13 additions & 5 deletions play-services-wearable/core/src/main/java/org/microg/gms/wearable/WearableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,16 @@ public synchronized ConnectionConfiguration[] getConfigurations() {
if (configurations == null) {
configurations = configDatabase.getAllConfigurations();
}
if (configurations == null) {
configurations = new ConnectionConfiguration[0];
}
if (configurationsUpdated) {
configurationsUpdated = false;
ConnectionConfiguration[] newConfigurations = configDatabase.getAllConfigurations();
if (newConfigurations == null) newConfigurations = new ConnectionConfiguration[0];
for (ConnectionConfiguration configuration : configurations) {
for (ConnectionConfiguration newConfiguration : newConfigurations) {
if (newConfiguration.name.equals(configuration.name)) {
if (newConfiguration.name != null && newConfiguration.name.equals(configuration.name)) {
newConfiguration.connected = configuration.connected;
newConfiguration.peerNodeId = configuration.peerNodeId;
newConfiguration.nodeId = configuration.nodeId;
Expand Down Expand Up @@ -339,8 +343,8 @@ public void handleFilePiece(WearableConnection connection, String fileName, byte

public void onConnectReceived(WearableConnection connection, String nodeId, Connect connect) {
for (ConnectionConfiguration config : getConfigurations()) {
if (config.nodeId.equals(nodeId)) {
if (config.nodeId != nodeId) {
if (nodeId != null && nodeId.equals(config.nodeId)) {
if (connect.id != null && !connect.id.equals(config.nodeId)) {
config.nodeId = connect.id;
configDatabase.putConfiguration(config, nodeId);
}
Expand Down Expand Up @@ -375,7 +379,7 @@ public void onConnectReceived(WearableConnection connection, String nodeId, Conn

public void onDisconnectReceived(WearableConnection connection, Connect connect) {
for (ConnectionConfiguration config : getConfigurations()) {
if (config.nodeId.equals(connect.id)) {
if (connect.id != null && connect.id.equals(config.nodeId)) {
config.connected = false;
}
}
Expand Down Expand Up @@ -576,12 +580,16 @@ private IWearableListener getListener(String packageName, String action, Uri uri

private void closeConnection(String nodeId) {
WearableConnection connection = activeConnections.get(nodeId);
if (connection == null) {
Log.w(TAG, "closeConnection called for unknown nodeId: " + nodeId);
return;
}
try {
connection.close();
} catch (IOException e1) {
Log.w(TAG, e1);
}
if (connection == sct.getWearableConnection()) {
if (sct != null && connection == sct.getWearableConnection()) {
sct.close();
sct = null;
}
Expand Down