Skip to content

fix: resolve #2843 #3510

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
duongynhi000005-oss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve #2843 #3510

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
6 changes: 5 additions & 1 deletion play-services-core/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,11 @@
<activity
android:name="com.google.android.gms.wearable.consent.TermsOfServiceActivity"
android:process=":ui"
android:configChanges="screenSize|orientation|keyboardHidden">
android:configChanges="screenSize|orientation|keyboardHidden"
android:excludeFromRecents="true"
android:exported="true"
android:noHistory="true"
android:theme="@style/Theme.App.Translucent">
<intent-filter>
<action android:name="com.google.android.gms.wearable.TOS"/>
<category android:name="android.intent.category.DEFAULT"/>
Expand Down
5 changes: 3 additions & 2 deletions ...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 @@ -5,14 +5,15 @@

package com.google.android.gms.wearable.consent

import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity

class TermsOfServiceActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setResult(RESULT_CANCELED)
setResult(RESULT_OK, Intent())
finish()
}
}
}
20 changes: 16 additions & 4 deletions play-services-wearable/core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

public class WearableServiceImpl extends IWearableService.Stub {
private static final String TAG = "GmsWearSvcImpl";
private static final String PREFS_NAME = "wearable";
private static final String PREF_CLOUD_SYNC_ENABLED = "cloud_sync_enabled";

private final Context context;
private final String packageName;
Expand Down Expand Up @@ -228,28 +230,30 @@ public void getFdForAsset(IWearableCallbacks callbacks, final Asset asset) throw

@Override
public void optInCloudSync(IWearableCallbacks callbacks, boolean enable) throws RemoteException {
setCloudSyncEnabled(enable);
callbacks.onStatus(Status.SUCCESS);
}

@Override
@Deprecated
public void getCloudSyncOptInDone(IWearableCallbacks callbacks) throws RemoteException {
Log.d(TAG, "unimplemented Method: getCloudSyncOptInDone");
callbacks.onGetCloudSyncOptInOutDoneResponse(new GetCloudSyncOptInOutDoneResponse());
}

@Override
public void setCloudSyncSetting(IWearableCallbacks callbacks, boolean enable) throws RemoteException {
Log.d(TAG, "unimplemented Method: setCloudSyncSetting");
setCloudSyncEnabled(enable);
callbacks.onStatus(Status.SUCCESS);
}

@Override
public void getCloudSyncSetting(IWearableCallbacks callbacks) throws RemoteException {
callbacks.onGetCloudSyncSettingResponse(new GetCloudSyncSettingResponse(0, false));
callbacks.onGetCloudSyncSettingResponse(new GetCloudSyncSettingResponse(0, getCloudSyncEnabled()));
}

@Override
public void getCloudSyncOptInStatus(IWearableCallbacks callbacks) throws RemoteException {
Log.d(TAG, "unimplemented Method: getCloudSyncOptInStatus");
callbacks.onGetCloudSyncOptInStatusResponse(new GetCloudSyncOptInStatusResponse());
}

@Override
Expand Down Expand Up @@ -476,6 +480,14 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws
return false;
}

private boolean getCloudSyncEnabled() {
return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).getBoolean(PREF_CLOUD_SYNC_ENABLED, false);
}

private void setCloudSyncEnabled(boolean enabled) {
context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE).edit().putBoolean(PREF_CLOUD_SYNC_ENABLED, enabled).apply();
}

public abstract class CallbackRunnable implements Runnable {
private IWearableCallbacks callbacks;

Expand Down