Skip to content
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
1 change: 0 additions & 1 deletion .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ jobs:
echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
echo 'org.gradle.parallel=true' >> ~/.gradle/gradle.properties
echo 'org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -XX:+UseParallelGC' >> ~/.gradle/gradle.properties
echo 'android.native.buildOutput=verbose' >> ~/.gradle/gradle.properties
- name: Setup ninja
uses: seanmiddleditch/gha-setup-ninja@v6
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ tasks.register<KtfmtFormatTask>("format") {
"*/build.gradle.kts",
"hiddenapi/*/build.gradle.kts",
"services/*-service/build.gradle.kts",
"buildSrc/src/main/kotlin/**/*.kt",
)
// The daemon subproject is stuck on ktfmt's default (Meta) style instead of the
// kotlinLangStyle() applied everywhere else — the wrong style was set for it, but a
Expand Down
57 changes: 0 additions & 57 deletions buildSrc/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions buildSrc/build.gradle.kts

This file was deleted.

91 changes: 0 additions & 91 deletions buildSrc/src/main/kotlin/GenerateLangListTask.kt

This file was deleted.

54 changes: 0 additions & 54 deletions buildSrc/src/main/kotlin/GenerateMaterialThemeTask.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import org.matrix.vector.daemon.CliResponse
import org.matrix.vector.daemon.data.ConfigCache
import org.matrix.vector.daemon.data.ModuleDatabase
import org.matrix.vector.daemon.data.PreferenceStore
import org.matrix.vector.daemon.system.*

object CliHandler {

Expand Down Expand Up @@ -44,11 +43,6 @@ object CliHandler {
"Status Notification" to PreferenceStore.isStatusNotificationEnabled())
}

private fun isPackageInstalled(pkg: String, userId: Int = 0): Boolean {
return runCatching { packageManager?.getPackageInfo(pkg, 0, userId) != null }
.getOrDefault(false)
}

private fun handleModules(request: CliRequest): Any {
return when (request.action) {
"ls" -> {
Expand Down
31 changes: 0 additions & 31 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[versions]
agp = "9.3.1"
kotlin = "2.4.10"
nav = "2.9.8"
appcenter = "5.0.5"
glide = "5.0.9"
okhttp = "5.4.0"
ktfmt = "0.26.0"
coroutines = "1.11.0"
Expand All @@ -24,7 +21,6 @@ agp-app = { id = "com.android.application", version.ref = "agp" }
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
nav-safeargs = { id = "androidx.navigation.safeargs", version.ref = "nav" }
ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
lsplugin-apksign = { id = "org.lsposed.lsplugin.apksign", version = "1.4" }

Expand Down Expand Up @@ -62,42 +58,15 @@ coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp"

kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.11.0" }

rikkax-appcompat = { module = "dev.rikka.rikkax.appcompat:appcompat", version = "1.6.1" }
rikkax-core = { module = "dev.rikka.rikkax.core:core", version = "1.4.1" }
rikkax-insets = { module = "dev.rikka.rikkax.insets:insets", version = "1.3.0" }
rikkax-layoutinflater = { module = "dev.rikka.rikkax.layoutinflater:layoutinflater", version = "1.3.0" }
rikkax-material = { module = "dev.rikka.rikkax.material:material", version = "2.7.2" }
rikkax-material-preference = { module = "dev.rikka.rikkax.material:material-preference", version = "2.0.0" }
rikkax-parcelablelist = { module = "dev.rikka.rikkax.parcelablelist:parcelablelist", version = "2.0.1" }
rikkax-recyclerview = { module = "dev.rikka.rikkax.recyclerview:recyclerview-ktx", version = "1.3.2" }
rikkax-widget-borderview = { module = "dev.rikka.rikkax.widget:borderview", version = "1.1.0" }
rikkax-widget-mainswitchbar = { module = "dev.rikka.rikkax.widget:mainswitchbar", version = "1.0.2" }

androidx-activity = { module = "androidx.activity:activity", version = "1.13.0" }
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.10.0" }
androidx-browser = { module = "androidx.browser:browser", version = "1.10.0" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
androidx-core = { module = "androidx.core:core", version = "1.19.0" }
androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.9" }
androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "nav" }
androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "nav" }
androidx-preference = { module = "androidx.preference:preference", version = "1.2.1" }
androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.2.0" }

glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "glide" }

okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
okhttp-dnsoverhttps = { group = "com.squareup.okhttp3", name = "okhttp-dnsoverhttps", version.ref = "okhttp" }
okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }

agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" }
appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" }
material = { module = "com.google.android.material:material", version = "1.12.0" }
gson = { module = "com.google.code.gson:gson", version = "2.14.0" }
hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version = "6.1" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
picocli = { module = "info.picocli:picocli", version = "4.7.7" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@ public ByteBufferDexClassLoader(ByteBuffer[] dexFiles, ClassLoader parent) {
public ByteBufferDexClassLoader(ByteBuffer[] dexFiles, String librarySearchPath, ClassLoader parent) {
super(dexFiles, librarySearchPath, parent);
}

public String getLdLibraryPath() {
return super.getLdLibraryPath();
}
}
29 changes: 0 additions & 29 deletions hiddenapi/bridge/src/main/java/hidden/HiddenApiBridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,14 @@
package hidden;

import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInstaller;
import android.content.res.AssetManager;
import android.content.res.CompatibilityInfo;
import android.content.res.Resources;
import android.content.res.ResourcesImpl;
import android.os.Binder;
import android.os.Build;
import android.os.Environment;
import android.os.Handler;
import android.os.IBinder;
import android.os.UserHandle;
import android.system.ErrnoException;
Expand All @@ -43,7 +37,6 @@

import androidx.annotation.RequiresApi;

import java.io.File;
import java.io.FileDescriptor;

public class HiddenApiBridge {
Expand All @@ -59,32 +52,10 @@ public static void Resources_setImpl(Resources resources, ResourcesImpl impl) {
resources.setImpl(impl);
}

public static int PackageInstaller_SessionParams_installFlags(PackageInstaller.SessionParams params) {
return params.installFlags;
}

public static void PackageInstaller_SessionParams_installFlags(PackageInstaller.SessionParams params, int flags) {
params.installFlags = flags;
}

public static IBinder Context_getActivityToken(Context ctx) {
return ctx.getActivityToken();
}

public static File Environment_getDataProfilesDePackageDirectory(int userId, String packageName) {
return Environment.getDataProfilesDePackageDirectory(userId, packageName);
}

public static Intent Context_registerReceiverAsUser(Context ctx, BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, String broadcastPermission, Handler scheduler) {

return ctx.registerReceiverAsUser(receiver, user, filter, broadcastPermission, scheduler);
}

public static UserHandle UserHandle_ALL() {
return UserHandle.ALL;
}

public static UserHandle UserHandle(int h) {
return new UserHandle(h);
}
Expand Down
Loading
Loading