Skip to content

OcWeb: Improve OC corresponding JS method #2879

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.

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

Merged
merged 13 commits into from
Jul 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions play-services-core/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@
android:name="android.permission.UPDATE_APP_OPS_STATS"
tools:ignore="ProtectedPermissions" />

<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature
android:name="android.hardware.camera"
android:required="false" />

<uses-sdk
tools:overrideLibrary="androidx.compose.ui.tooling,
androidx.compose.material3,
Expand Down Expand Up @@ -266,6 +271,15 @@
android:multiprocess="false"
android:readPermission="android.permission.SUBSCRIBED_FEEDS_READ"
android:writePermission="android.permission.SUBSCRIBED_FEEDS_WRITE" />
<provider
android:authorities="com.google.android.gms.fileprovider"
android:name="org.microg.gms.settings.GmsFileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider_paths"/>
</provider>

<!-- Device Checkin -->

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/**
* SPDX-FileCopyrightText: 2025 microG Project Team
* SPDX-License-Identifier: Apache-2.0
*/

package org.microg.gms.settings

import android.content.Context
import android.content.pm.ProviderInfo
import android.database.Cursor
import android.database.MatrixCursor
import android.net.Uri
import android.os.CancellationSignal
import android.os.ParcelFileDescriptor
import android.util.Log
import androidx.core.content.FileProvider
import java.io.FileNotFoundException

private const val TAG = "GmsFileProvider"

class GmsFileProvider : FileProvider() {
private val emptyProjection = arrayOfNulls<String>(0)
private var initializationFailed = false

override fun attachInfo(context: Context, info: ProviderInfo) {
try {
super.attachInfo(context, info)
} catch (e: Exception) {
initializationFailed = true
Log.e(TAG, "attachInfo error:${e.message}")
}
}

override fun onCreate(): Boolean {
return true
}

override fun getType(uri: Uri): String? {
if (initializationFailed) {
return null
}
return super.getType(uri)
}

override fun openFile(
uri: Uri, mode: String, signal: CancellationSignal?
): ParcelFileDescriptor? {
if (!initializationFailed) {
return super.openFile(uri, mode, signal)
}
throw FileNotFoundException("FileProvider creation failed")
}

override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int {
if (initializationFailed) {
return 0
}
return super.delete(uri, selection, selectionArgs)
}

override fun query(
uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, sortOrder: String?
): Cursor {
if (initializationFailed) {
return MatrixCursor(emptyProjection)
}
return super.query(uri, projection, selection, selectionArgs, sortOrder)
}
}
Loading