diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 391c8ae5..9b945f5d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -49,7 +49,7 @@ android { } defaultConfig { - applicationId("io.github.lsposed.manager") + applicationId("org.lsposed.manager") minSdkVersion(androidMinSdkVersion) targetSdkVersion(androidTargetSdkVersion) versionCode(verCode) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f97f70de..4f39e3ba 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,5 +1,5 @@ --keep class io.github.lsposed.manager.Constants { *; } --keepclasseswithmembers class io.github.lsposed.manager.receivers.LSPosedManagerServiceClient { +-keep class org.lsposed.manager.Constants { *; } +-keepclasseswithmembers class org.lsposed.manager.receivers.LSPosedManagerServiceClient { private static android.os.IBinder binder; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 875b7d52..080804a0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,10 +21,11 @@ + package="org.lsposed.manager"> - + @@ -82,8 +83,8 @@ android:exported="true" android:permission="android.permission.INTERACT_ACROSS_USERS_FULL"> - - + + @@ -100,4 +101,4 @@ - \ No newline at end of file + diff --git a/app/src/main/java/name/mikanoshi/customiuizer/holidays/FlowerParticle.java b/app/src/main/java/name/mikanoshi/customiuizer/holidays/FlowerParticle.java index f1193f25..6e220d8a 100644 --- a/app/src/main/java/name/mikanoshi/customiuizer/holidays/FlowerParticle.java +++ b/app/src/main/java/name/mikanoshi/customiuizer/holidays/FlowerParticle.java @@ -14,7 +14,7 @@ import com.github.matteobattilana.weather.confetti.ConfettoInfo; import java.util.Random; -import io.github.lsposed.manager.R; +import org.lsposed.manager.R; @SuppressWarnings("FieldCanBeLocal") public class FlowerParticle extends Confetto { diff --git a/app/src/main/java/name/mikanoshi/customiuizer/holidays/HolidayHelper.java b/app/src/main/java/name/mikanoshi/customiuizer/holidays/HolidayHelper.java index 19c8f67c..40f5d3f4 100644 --- a/app/src/main/java/name/mikanoshi/customiuizer/holidays/HolidayHelper.java +++ b/app/src/main/java/name/mikanoshi/customiuizer/holidays/HolidayHelper.java @@ -5,7 +5,6 @@ import android.view.Surface; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.RelativeLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout; @@ -17,7 +16,7 @@ import com.github.matteobattilana.weather.WeatherView; import java.lang.ref.WeakReference; import java.lang.reflect.Field; -import io.github.lsposed.manager.R; +import org.lsposed.manager.R; import name.mikanoshi.customiuizer.utils.GravitySensor; import name.mikanoshi.customiuizer.utils.Helpers; diff --git a/app/src/main/java/name/mikanoshi/customiuizer/holidays/SnowParticle.java b/app/src/main/java/name/mikanoshi/customiuizer/holidays/SnowParticle.java index f7c4b818..626fc9c2 100644 --- a/app/src/main/java/name/mikanoshi/customiuizer/holidays/SnowParticle.java +++ b/app/src/main/java/name/mikanoshi/customiuizer/holidays/SnowParticle.java @@ -10,7 +10,7 @@ import android.graphics.Paint; import com.github.jinatonic.confetti.confetto.Confetto; import com.github.matteobattilana.weather.confetti.ConfettoInfo; -import io.github.lsposed.manager.R; +import org.lsposed.manager.R; public class SnowParticle extends Confetto { private Float prevX; diff --git a/app/src/main/java/io/github/lsposed/manager/App.java b/app/src/main/java/org/lsposed/manager/App.java similarity index 94% rename from app/src/main/java/io/github/lsposed/manager/App.java rename to app/src/main/java/org/lsposed/manager/App.java index bb871590..66d70c00 100644 --- a/app/src/main/java/io/github/lsposed/manager/App.java +++ b/app/src/main/java/org/lsposed/manager/App.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager; +package org.lsposed.manager; import android.annotation.SuppressLint; import android.app.Application; @@ -34,10 +34,10 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Locale; -import io.github.lsposed.manager.repo.RepoLoader; -import io.github.lsposed.manager.ui.activity.CrashReportActivity; -import io.github.lsposed.manager.util.DoHDNS; -import io.github.lsposed.manager.util.theme.ThemeUtil; +import org.lsposed.manager.repo.RepoLoader; +import org.lsposed.manager.ui.activity.CrashReportActivity; +import org.lsposed.manager.util.DoHDNS; +import org.lsposed.manager.util.theme.ThemeUtil; import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; diff --git a/app/src/main/java/io/github/lsposed/manager/ConfigManager.java b/app/src/main/java/org/lsposed/manager/ConfigManager.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/ConfigManager.java rename to app/src/main/java/org/lsposed/manager/ConfigManager.java index 3c0b5280..67ee39e0 100644 --- a/app/src/main/java/io/github/lsposed/manager/ConfigManager.java +++ b/app/src/main/java/org/lsposed/manager/ConfigManager.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager; +package org.lsposed.manager; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -29,10 +29,10 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.lspd.utils.ParceledListSlice; -import io.github.lsposed.manager.adapters.ScopeAdapter; -import io.github.lsposed.manager.receivers.LSPosedManagerServiceClient; +import org.lsposed.lspd.Application; +import org.lsposed.lspd.utils.ParceledListSlice; +import org.lsposed.manager.adapters.ScopeAdapter; +import org.lsposed.manager.receivers.LSPosedManagerServiceClient; public class ConfigManager { diff --git a/app/src/main/java/io/github/lsposed/manager/Constants.java b/app/src/main/java/org/lsposed/manager/Constants.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/Constants.java rename to app/src/main/java/org/lsposed/manager/Constants.java index fc94ac2a..57ab6084 100644 --- a/app/src/main/java/io/github/lsposed/manager/Constants.java +++ b/app/src/main/java/org/lsposed/manager/Constants.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager; +package org.lsposed.manager; import android.widget.Toast; diff --git a/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java b/app/src/main/java/org/lsposed/manager/adapters/AppHelper.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java rename to app/src/main/java/org/lsposed/manager/adapters/AppHelper.java index f2db06af..87219d4e 100644 --- a/app/src/main/java/io/github/lsposed/manager/adapters/AppHelper.java +++ b/app/src/main/java/org/lsposed/manager/adapters/AppHelper.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.adapters; +package org.lsposed.manager.adapters; import android.content.Intent; import android.content.SharedPreferences; @@ -32,8 +32,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; public class AppHelper { diff --git a/app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java rename to app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java index d327bc0d..d091b3ac 100644 --- a/app/src/main/java/io/github/lsposed/manager/adapters/ScopeAdapter.java +++ b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.adapters; +package org.lsposed.manager.adapters; import android.annotation.SuppressLint; import android.content.Intent; @@ -68,15 +68,15 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.ui.activity.AppListActivity; -import io.github.lsposed.manager.ui.fragment.CompileDialogFragment; -import io.github.lsposed.manager.util.GlideApp; -import io.github.lsposed.manager.util.ModuleUtil; +import org.lsposed.lspd.Application; +import org.lsposed.manager.App; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.ui.activity.AppListActivity; +import org.lsposed.manager.ui.fragment.CompileDialogFragment; +import org.lsposed.manager.util.GlideApp; +import org.lsposed.manager.util.ModuleUtil; import rikka.core.res.ResourcesKt; import rikka.widget.switchbar.SwitchBar; diff --git a/app/src/main/java/io/github/lsposed/manager/receivers/LSPosedManagerServiceClient.java b/app/src/main/java/org/lsposed/manager/receivers/LSPosedManagerServiceClient.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/receivers/LSPosedManagerServiceClient.java rename to app/src/main/java/org/lsposed/manager/receivers/LSPosedManagerServiceClient.java index 7ff927c9..e25512fc 100644 --- a/app/src/main/java/io/github/lsposed/manager/receivers/LSPosedManagerServiceClient.java +++ b/app/src/main/java/org/lsposed/manager/receivers/LSPosedManagerServiceClient.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.receivers; +package org.lsposed.manager.receivers; import android.content.pm.PackageInfo; import android.os.IBinder; @@ -26,9 +26,9 @@ import android.os.RemoteException; import java.util.List; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.lspd.ILSPManagerService; -import io.github.lsposed.lspd.utils.ParceledListSlice; +import org.lsposed.lspd.Application; +import org.lsposed.lspd.ILSPManagerService; +import org.lsposed.lspd.utils.ParceledListSlice; public class LSPosedManagerServiceClient { diff --git a/app/src/main/java/io/github/lsposed/manager/receivers/ServiceReceiver.java b/app/src/main/java/org/lsposed/manager/receivers/ServiceReceiver.java similarity index 83% rename from app/src/main/java/io/github/lsposed/manager/receivers/ServiceReceiver.java rename to app/src/main/java/org/lsposed/manager/receivers/ServiceReceiver.java index e5c5ecee..fc46fc01 100644 --- a/app/src/main/java/io/github/lsposed/manager/receivers/ServiceReceiver.java +++ b/app/src/main/java/org/lsposed/manager/receivers/ServiceReceiver.java @@ -18,15 +18,15 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.receivers; +package org.lsposed.manager.receivers; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.net.Uri; -import io.github.lsposed.manager.util.ModuleUtil; -import io.github.lsposed.manager.util.NotificationUtil; +import org.lsposed.manager.util.ModuleUtil; +import org.lsposed.manager.util.NotificationUtil; public class ServiceReceiver extends BroadcastReceiver { @@ -47,9 +47,9 @@ public class ServiceReceiver extends BroadcastReceiver { return; } - if (intent.getAction().equals("io.github.lsposed.action.MODULE_NOT_ACTIVATAED")) { + if (intent.getAction().equals("org.lsposed.action.MODULE_NOT_ACTIVATAED")) { NotificationUtil.showNotification(context, packageName, module.getAppName(), false); - } else if (intent.getAction().equals("io.github.lsposed.action.MODULE_UPDATED")) { + } else if (intent.getAction().equals("org.lsposed.action.MODULE_UPDATED")) { NotificationUtil.showNotification(context, packageName, module.getAppName(), true); } } diff --git a/app/src/main/java/io/github/lsposed/manager/repo/RepoLoader.java b/app/src/main/java/org/lsposed/manager/repo/RepoLoader.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/repo/RepoLoader.java rename to app/src/main/java/org/lsposed/manager/repo/RepoLoader.java index 427c09c8..2e3a84f9 100644 --- a/app/src/main/java/io/github/lsposed/manager/repo/RepoLoader.java +++ b/app/src/main/java/org/lsposed/manager/repo/RepoLoader.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.repo; +package org.lsposed.manager.repo; import android.util.Log; @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.repo.model.OnlineModule; +import org.lsposed.manager.App; +import org.lsposed.manager.repo.model.OnlineModule; import okhttp3.Call; import okhttp3.Callback; import okhttp3.Request; diff --git a/app/src/main/java/io/github/lsposed/manager/repo/model/Collaborator.java b/app/src/main/java/org/lsposed/manager/repo/model/Collaborator.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/repo/model/Collaborator.java rename to app/src/main/java/org/lsposed/manager/repo/model/Collaborator.java index 078501ba..b24161a3 100644 --- a/app/src/main/java/io/github/lsposed/manager/repo/model/Collaborator.java +++ b/app/src/main/java/org/lsposed/manager/repo/model/Collaborator.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.repo.model; +package org.lsposed.manager.repo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/io/github/lsposed/manager/repo/model/OnlineModule.java b/app/src/main/java/org/lsposed/manager/repo/model/OnlineModule.java similarity index 99% rename from app/src/main/java/io/github/lsposed/manager/repo/model/OnlineModule.java rename to app/src/main/java/org/lsposed/manager/repo/model/OnlineModule.java index caaaee61..8bb66f41 100644 --- a/app/src/main/java/io/github/lsposed/manager/repo/model/OnlineModule.java +++ b/app/src/main/java/org/lsposed/manager/repo/model/OnlineModule.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.repo.model; +package org.lsposed.manager.repo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/io/github/lsposed/manager/repo/model/Release.java b/app/src/main/java/org/lsposed/manager/repo/model/Release.java similarity index 99% rename from app/src/main/java/io/github/lsposed/manager/repo/model/Release.java rename to app/src/main/java/org/lsposed/manager/repo/model/Release.java index 445a9f6f..c5246af6 100644 --- a/app/src/main/java/io/github/lsposed/manager/repo/model/Release.java +++ b/app/src/main/java/org/lsposed/manager/repo/model/Release.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.repo.model; +package org.lsposed.manager.repo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/io/github/lsposed/manager/repo/model/ReleaseAsset.java b/app/src/main/java/org/lsposed/manager/repo/model/ReleaseAsset.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/repo/model/ReleaseAsset.java rename to app/src/main/java/org/lsposed/manager/repo/model/ReleaseAsset.java index be447871..42bd8512 100644 --- a/app/src/main/java/io/github/lsposed/manager/repo/model/ReleaseAsset.java +++ b/app/src/main/java/org/lsposed/manager/repo/model/ReleaseAsset.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.repo.model; +package org.lsposed.manager.repo.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/AppListActivity.java similarity index 95% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/AppListActivity.java index 0c91c3f6..75dbb1d6 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/AppListActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/AppListActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.content.Intent; import android.os.AsyncTask; @@ -37,13 +37,13 @@ import androidx.appcompat.widget.SearchView; import com.google.android.material.snackbar.Snackbar; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.adapters.ScopeAdapter; -import io.github.lsposed.manager.databinding.ActivityAppListBinding; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.util.BackupUtils; -import io.github.lsposed.manager.util.LinearLayoutManagerFix; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.R; +import org.lsposed.manager.adapters.ScopeAdapter; +import org.lsposed.manager.databinding.ActivityAppListBinding; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.util.BackupUtils; +import org.lsposed.manager.util.LinearLayoutManagerFix; import rikka.recyclerview.RecyclerViewKt; public class AppListActivity extends BaseActivity { diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/CrashReportActivity.java similarity index 95% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/CrashReportActivity.java index b1d98647..bd519e20 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/CrashReportActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/CrashReportActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.content.ClipData; import android.content.ClipboardManager; @@ -38,9 +38,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityCrashReportBinding; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivityCrashReportBinding; public class CrashReportActivity extends AppCompatActivity { ActivityCrashReportBinding binding; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java index f7c4087f..77cef019 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/LogsActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/LogsActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.annotation.SuppressLint; import android.content.Intent; @@ -62,14 +62,14 @@ import java.util.Calendar; import java.util.List; import java.util.Locale; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityLogsBinding; -import io.github.lsposed.manager.databinding.DialogInstallWarningBinding; -import io.github.lsposed.manager.databinding.ItemLogBinding; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.util.LinearLayoutManagerFix; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivityLogsBinding; +import org.lsposed.manager.databinding.DialogInstallWarningBinding; +import org.lsposed.manager.databinding.ItemLogBinding; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.util.LinearLayoutManagerFix; import rikka.core.os.FileUtils; import rikka.recyclerview.RecyclerViewKt; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java similarity index 91% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java index 7ca007b9..b1819def 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.content.Intent; import android.os.Build; @@ -36,17 +36,17 @@ import java.io.File; import java.util.Arrays; import java.util.Locale; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityMainBinding; -import io.github.lsposed.manager.databinding.DialogAboutBinding; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.ui.dialog.BlurBehindDialogBuilder; -import io.github.lsposed.manager.ui.dialog.InfoDialogBuilder; -import io.github.lsposed.manager.util.GlideHelper; -import io.github.lsposed.manager.util.ModuleUtil; -import io.github.lsposed.manager.util.NavUtil; -import io.github.lsposed.manager.util.chrome.LinkTransformationMethod; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivityMainBinding; +import org.lsposed.manager.databinding.DialogAboutBinding; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder; +import org.lsposed.manager.ui.dialog.InfoDialogBuilder; +import org.lsposed.manager.util.GlideHelper; +import org.lsposed.manager.util.ModuleUtil; +import org.lsposed.manager.util.NavUtil; +import org.lsposed.manager.util.chrome.LinkTransformationMethod; import name.mikanoshi.customiuizer.holidays.HolidayHelper; import name.mikanoshi.customiuizer.utils.Helpers; import rikka.core.res.ResourcesKt; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/ModulesActivity.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/ModulesActivity.java index e82fee8f..abd21522 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/ModulesActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/ModulesActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.content.Intent; import android.content.pm.PackageInfo; @@ -62,13 +62,13 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.adapters.AppHelper; -import io.github.lsposed.manager.repo.RepoLoader; -import io.github.lsposed.manager.ui.activity.base.ListActivity; -import io.github.lsposed.manager.util.GlideApp; -import io.github.lsposed.manager.util.ModuleUtil; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.adapters.AppHelper; +import org.lsposed.manager.repo.RepoLoader; +import org.lsposed.manager.ui.activity.base.ListActivity; +import org.lsposed.manager.util.GlideApp; +import org.lsposed.manager.util.ModuleUtil; import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/RepoActivity.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/RepoActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/RepoActivity.java index eb59109f..fd663513 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/RepoActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.content.Intent; import android.os.Bundle; @@ -47,10 +47,10 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.repo.RepoLoader; -import io.github.lsposed.manager.repo.model.OnlineModule; -import io.github.lsposed.manager.ui.activity.base.ListActivity; +import org.lsposed.manager.R; +import org.lsposed.manager.repo.RepoLoader; +import org.lsposed.manager.repo.model.OnlineModule; +import org.lsposed.manager.ui.activity.base.ListActivity; import rikka.core.util.LabelComparator; public class RepoActivity extends ListActivity implements RepoLoader.Listener { diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/RepoItemActivity.java similarity index 93% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/RepoItemActivity.java index 02315146..9343a537 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/RepoItemActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.os.Bundle; import android.text.Spannable; @@ -48,25 +48,25 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityModuleDetailBinding; -import io.github.lsposed.manager.databinding.ItemRepoLoadmoreBinding; -import io.github.lsposed.manager.databinding.ItemRepoReadmeBinding; -import io.github.lsposed.manager.databinding.ItemRepoRecyclerviewBinding; -import io.github.lsposed.manager.databinding.ItemRepoReleaseBinding; -import io.github.lsposed.manager.databinding.ItemRepoTitleDescriptionBinding; -import io.github.lsposed.manager.repo.RepoLoader; -import io.github.lsposed.manager.repo.model.Collaborator; -import io.github.lsposed.manager.repo.model.OnlineModule; -import io.github.lsposed.manager.repo.model.Release; -import io.github.lsposed.manager.repo.model.ReleaseAsset; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.ui.widget.LinkifyTextView; -import io.github.lsposed.manager.util.GlideApp; -import io.github.lsposed.manager.util.LinearLayoutManagerFix; -import io.github.lsposed.manager.util.NavUtil; -import io.github.lsposed.manager.util.chrome.CustomTabsURLSpan; -import io.github.lsposed.manager.util.chrome.LinkTransformationMethod; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivityModuleDetailBinding; +import org.lsposed.manager.databinding.ItemRepoLoadmoreBinding; +import org.lsposed.manager.databinding.ItemRepoReadmeBinding; +import org.lsposed.manager.databinding.ItemRepoRecyclerviewBinding; +import org.lsposed.manager.databinding.ItemRepoReleaseBinding; +import org.lsposed.manager.databinding.ItemRepoTitleDescriptionBinding; +import org.lsposed.manager.repo.RepoLoader; +import org.lsposed.manager.repo.model.Collaborator; +import org.lsposed.manager.repo.model.OnlineModule; +import org.lsposed.manager.repo.model.Release; +import org.lsposed.manager.repo.model.ReleaseAsset; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.ui.widget.LinkifyTextView; +import org.lsposed.manager.util.GlideApp; +import org.lsposed.manager.util.LinearLayoutManagerFix; +import org.lsposed.manager.util.NavUtil; +import org.lsposed.manager.util.chrome.CustomTabsURLSpan; +import org.lsposed.manager.util.chrome.LinkTransformationMethod; import io.noties.markwon.Markwon; import io.noties.markwon.SoftBreakAddsNewLinePlugin; import io.noties.markwon.ext.strikethrough.StrikethroughPlugin; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/SettingsActivity.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/SettingsActivity.java index 2df8ee34..557db605 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/SettingsActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity; +package org.lsposed.manager.ui.activity; import android.annotation.SuppressLint; import android.content.Context; @@ -46,13 +46,13 @@ import com.takisoft.preferencex.PreferenceFragmentCompat; import java.util.Calendar; import java.util.Locale; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivitySettingsBinding; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.util.BackupUtils; -import io.github.lsposed.manager.util.theme.ThemeUtil; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivitySettingsBinding; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.util.BackupUtils; +import org.lsposed.manager.util.theme.ThemeUtil; import rikka.core.util.ResourceUtils; import rikka.material.app.DayNightDelegate; import rikka.recyclerview.RecyclerViewKt; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/base/BaseActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java similarity index 90% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/base/BaseActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java index 362d6c75..29b38641 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/base/BaseActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity.base; +package org.lsposed.manager.ui.activity.base; import android.content.SharedPreferences; import android.content.res.Resources; @@ -31,13 +31,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.Constants; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.util.NavUtil; -import io.github.lsposed.manager.util.theme.ThemeUtil; +import org.lsposed.manager.App; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.Constants; +import org.lsposed.manager.R; +import org.lsposed.manager.util.NavUtil; +import org.lsposed.manager.util.theme.ThemeUtil; import rikka.core.res.ResourcesKt; import rikka.material.app.MaterialActivity; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/base/ListActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/base/ListActivity.java similarity index 94% rename from app/src/main/java/io/github/lsposed/manager/ui/activity/base/ListActivity.java rename to app/src/main/java/org/lsposed/manager/ui/activity/base/ListActivity.java index f5f46fd8..8af6b529 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/base/ListActivity.java +++ b/app/src/main/java/org/lsposed/manager/ui/activity/base/ListActivity.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.activity.base; +package org.lsposed.manager.ui.activity.base; import android.os.Bundle; import android.view.Menu; @@ -29,9 +29,9 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.SearchView; import androidx.recyclerview.widget.RecyclerView; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityListBinding; -import io.github.lsposed.manager.util.LinearLayoutManagerFix; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.ActivityListBinding; +import org.lsposed.manager.util.LinearLayoutManagerFix; import rikka.recyclerview.RecyclerViewKt; public abstract class ListActivity extends BaseActivity { diff --git a/app/src/main/java/io/github/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java rename to app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java index 5f598be7..c199f90a 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.dialog; +package org.lsposed.manager.ui.dialog; import android.animation.ValueAnimator; import android.annotation.SuppressLint; diff --git a/app/src/main/java/io/github/lsposed/manager/ui/dialog/InfoDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java similarity index 94% rename from app/src/main/java/io/github/lsposed/manager/ui/dialog/InfoDialogBuilder.java rename to app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java index 3824c71e..3d82b07c 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/dialog/InfoDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/InfoDialogBuilder.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.dialog; +package org.lsposed.manager.ui.dialog; import android.content.Context; import android.os.Build; @@ -29,10 +29,10 @@ import androidx.core.text.HtmlCompat; import java.util.Locale; -import io.github.lsposed.manager.BuildConfig; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.DialogInfoBinding; +import org.lsposed.manager.BuildConfig; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.DialogInfoBinding; import rikka.core.util.ClipboardUtils; public class InfoDialogBuilder extends BlurBehindDialogBuilder { @@ -83,4 +83,4 @@ public class InfoDialogBuilder extends BlurBehindDialogBuilder { manufacturer += " " + Build.MODEL + " "; return manufacturer; } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java rename to app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java index 254bdc40..2f3d7ebe 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/fragment/CompileDialogFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.fragment; +package org.lsposed.manager.ui.fragment; import android.app.Dialog; import android.content.Context; @@ -42,10 +42,10 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.lang.ref.WeakReference; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.FragmentCompileDialogBinding; -import io.github.lsposed.manager.ui.activity.AppListActivity; +import org.lsposed.manager.App; +import org.lsposed.manager.R; +import org.lsposed.manager.databinding.FragmentCompileDialogBinding; +import org.lsposed.manager.ui.activity.AppListActivity; @SuppressWarnings("deprecation") public class CompileDialogFragment extends AppCompatDialogFragment { diff --git a/app/src/main/java/io/github/lsposed/manager/ui/widget/LinkifyTextView.java b/app/src/main/java/org/lsposed/manager/ui/widget/LinkifyTextView.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/ui/widget/LinkifyTextView.java rename to app/src/main/java/org/lsposed/manager/ui/widget/LinkifyTextView.java index 70a788a1..8cb31936 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/widget/LinkifyTextView.java +++ b/app/src/main/java/org/lsposed/manager/ui/widget/LinkifyTextView.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.ui.widget; +package org.lsposed.manager.ui.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/io/github/lsposed/manager/util/AppModule.java b/app/src/main/java/org/lsposed/manager/util/AppModule.java similarity index 88% rename from app/src/main/java/io/github/lsposed/manager/util/AppModule.java rename to app/src/main/java/org/lsposed/manager/util/AppModule.java index 853c5150..02b58191 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/AppModule.java +++ b/app/src/main/java/org/lsposed/manager/util/AppModule.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.content.Context; import android.content.pm.PackageInfo; @@ -38,11 +38,11 @@ import com.caverock.androidsvg.SVG; import java.io.InputStream; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.util.svg.ExternalFileResolver; -import io.github.lsposed.manager.util.svg.SvgDecoder; -import io.github.lsposed.manager.util.svg.SvgDrawableTranscoder; +import org.lsposed.manager.App; +import org.lsposed.manager.R; +import org.lsposed.manager.util.svg.ExternalFileResolver; +import org.lsposed.manager.util.svg.SvgDecoder; +import org.lsposed.manager.util.svg.SvgDrawableTranscoder; import me.zhanghai.android.appiconloader.glide.AppIconModelLoader; @GlideModule diff --git a/app/src/main/java/io/github/lsposed/manager/util/BackupUtils.java b/app/src/main/java/org/lsposed/manager/util/BackupUtils.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/util/BackupUtils.java rename to app/src/main/java/org/lsposed/manager/util/BackupUtils.java index 6b90fe71..182645a1 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/BackupUtils.java +++ b/app/src/main/java/org/lsposed/manager/util/BackupUtils.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.content.Context; import android.net.Uri; @@ -34,8 +34,8 @@ import java.util.Map; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.adapters.ScopeAdapter; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.adapters.ScopeAdapter; public class BackupUtils { private static final int VERSION = 2; diff --git a/app/src/main/java/io/github/lsposed/manager/util/DoHDNS.java b/app/src/main/java/org/lsposed/manager/util/DoHDNS.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/util/DoHDNS.java rename to app/src/main/java/org/lsposed/manager/util/DoHDNS.java index 551510c7..f7f54366 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/DoHDNS.java +++ b/app/src/main/java/org/lsposed/manager/util/DoHDNS.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import androidx.annotation.NonNull; @@ -27,7 +27,7 @@ import java.net.UnknownHostException; import java.util.List; import java.util.Locale; -import io.github.lsposed.manager.App; +import org.lsposed.manager.App; import okhttp3.Dns; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java b/app/src/main/java/org/lsposed/manager/util/GlideHelper.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java rename to app/src/main/java/org/lsposed/manager/util/GlideHelper.java index c3573bca..28a6f4e8 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/GlideHelper.java +++ b/app/src/main/java/org/lsposed/manager/util/GlideHelper.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; diff --git a/app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java b/app/src/main/java/org/lsposed/manager/util/LinearLayoutManagerFix.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java rename to app/src/main/java/org/lsposed/manager/util/LinearLayoutManagerFix.java index fd641375..36bdd948 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/LinearLayoutManagerFix.java +++ b/app/src/main/java/org/lsposed/manager/util/LinearLayoutManagerFix.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java b/app/src/main/java/org/lsposed/manager/util/ModuleUtil.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java rename to app/src/main/java/org/lsposed/manager/util/ModuleUtil.java index da9fe920..ef823f93 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/ModuleUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/ModuleUtil.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -37,10 +37,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.ConfigManager; -import io.github.lsposed.manager.repo.RepoLoader; -import io.github.lsposed.manager.repo.model.OnlineModule; +import org.lsposed.manager.App; +import org.lsposed.manager.ConfigManager; +import org.lsposed.manager.repo.RepoLoader; +import org.lsposed.manager.repo.model.OnlineModule; public final class ModuleUtil { // xposedminversion below this @@ -301,4 +301,4 @@ public final class ModuleUtil { return getAppName(); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java b/app/src/main/java/org/lsposed/manager/util/NavUtil.java similarity index 95% rename from app/src/main/java/io/github/lsposed/manager/util/NavUtil.java rename to app/src/main/java/org/lsposed/manager/util/NavUtil.java index 16b71943..a0ce6c73 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/NavUtil.java @@ -18,14 +18,14 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.net.Uri; import androidx.browser.customtabs.CustomTabColorSchemeParams; import androidx.browser.customtabs.CustomTabsIntent; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.ui.activity.base.BaseActivity; import rikka.core.res.ResourcesKt; import rikka.core.util.ResourceUtils; @@ -48,4 +48,4 @@ public final class NavUtil { public static void startURL(BaseActivity activity, String url) { startURL(activity, Uri.parse(url)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java b/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java similarity index 96% rename from app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java rename to app/src/main/java/org/lsposed/manager/util/NotificationUtil.java index bae9ad71..c3437676 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/NotificationUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/NotificationUtil.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util; +package org.lsposed.manager.util; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -28,8 +28,8 @@ import android.content.Intent; import androidx.core.app.NotificationCompat; -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.ui.activity.AppListActivity; +import org.lsposed.manager.R; +import org.lsposed.manager.ui.activity.AppListActivity; public final class NotificationUtil { @@ -72,4 +72,4 @@ public final class NotificationUtil { notificationManager.notify(modulePackageName, enabled ? NOTIFICATION_MODULES_UPDATED : NOTIFICATION_MODULE_NOT_ACTIVATED_YET, builder.build()); } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/chrome/CustomTabsURLSpan.java b/app/src/main/java/org/lsposed/manager/util/chrome/CustomTabsURLSpan.java similarity index 88% rename from app/src/main/java/io/github/lsposed/manager/util/chrome/CustomTabsURLSpan.java rename to app/src/main/java/org/lsposed/manager/util/chrome/CustomTabsURLSpan.java index 0c6cb68e..905d0854 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/chrome/CustomTabsURLSpan.java +++ b/app/src/main/java/org/lsposed/manager/util/chrome/CustomTabsURLSpan.java @@ -18,13 +18,13 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.chrome; +package org.lsposed.manager.util.chrome; import android.text.style.URLSpan; import android.view.View; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.util.NavUtil; +import org.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.util.NavUtil; public class CustomTabsURLSpan extends URLSpan { @@ -40,4 +40,4 @@ public class CustomTabsURLSpan extends URLSpan { String url = getURL(); NavUtil.startURL(activity, url); } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/chrome/LinkTransformationMethod.java b/app/src/main/java/org/lsposed/manager/util/chrome/LinkTransformationMethod.java similarity index 95% rename from app/src/main/java/io/github/lsposed/manager/util/chrome/LinkTransformationMethod.java rename to app/src/main/java/org/lsposed/manager/util/chrome/LinkTransformationMethod.java index f80fddda..d4888e27 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/chrome/LinkTransformationMethod.java +++ b/app/src/main/java/org/lsposed/manager/util/chrome/LinkTransformationMethod.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.chrome; +package org.lsposed.manager.util.chrome; import android.graphics.Rect; import android.text.Spannable; @@ -28,7 +28,7 @@ import android.text.style.URLSpan; import android.view.View; import android.widget.TextView; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; +import org.lsposed.manager.ui.activity.base.BaseActivity; public class LinkTransformationMethod implements TransformationMethod { @@ -63,4 +63,4 @@ public class LinkTransformationMethod implements TransformationMethod { @Override public void onFocusChanged(View view, CharSequence sourceText, boolean focused, int direction, Rect previouslyFocusedRect) { } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/svg/ExternalFileResolver.java b/app/src/main/java/org/lsposed/manager/util/svg/ExternalFileResolver.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/util/svg/ExternalFileResolver.java rename to app/src/main/java/org/lsposed/manager/util/svg/ExternalFileResolver.java index cb394250..1da60ba8 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/svg/ExternalFileResolver.java +++ b/app/src/main/java/org/lsposed/manager/util/svg/ExternalFileResolver.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.svg; +package org.lsposed.manager.util.svg; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/app/src/main/java/io/github/lsposed/manager/util/svg/SvgDecoder.java b/app/src/main/java/org/lsposed/manager/util/svg/SvgDecoder.java similarity index 97% rename from app/src/main/java/io/github/lsposed/manager/util/svg/SvgDecoder.java rename to app/src/main/java/org/lsposed/manager/util/svg/SvgDecoder.java index fa17246e..560953fc 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/svg/SvgDecoder.java +++ b/app/src/main/java/org/lsposed/manager/util/svg/SvgDecoder.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.svg; +package org.lsposed.manager.util.svg; import androidx.annotation.NonNull; diff --git a/app/src/main/java/io/github/lsposed/manager/util/svg/SvgDrawableTranscoder.java b/app/src/main/java/org/lsposed/manager/util/svg/SvgDrawableTranscoder.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/util/svg/SvgDrawableTranscoder.java rename to app/src/main/java/org/lsposed/manager/util/svg/SvgDrawableTranscoder.java index b2e34737..d75c393b 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/svg/SvgDrawableTranscoder.java +++ b/app/src/main/java/org/lsposed/manager/util/svg/SvgDrawableTranscoder.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.svg; +package org.lsposed.manager.util.svg; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreference.java b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreference.java rename to app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java index d46f8cbf..d24c64e1 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreference.java +++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.theme; +package org.lsposed.manager.util.theme; import android.annotation.SuppressLint; import android.content.Context; @@ -34,7 +34,7 @@ import androidx.preference.PreferenceViewHolder; import com.takisoft.preferencex.PreferenceFragmentCompat; -import io.github.lsposed.manager.R; +import org.lsposed.manager.R; public class ThemeColorPreference extends DialogPreference { @@ -182,4 +182,4 @@ public class ThemeColorPreference extends DialogPreference { } }; } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java rename to app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java index ea715e0c..b7187869 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java +++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.theme; +package org.lsposed.manager.util.theme; import android.app.Activity; import android.app.Dialog; diff --git a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeUtil.java b/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java similarity index 98% rename from app/src/main/java/io/github/lsposed/manager/util/theme/ThemeUtil.java rename to app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java index 95b1ec03..2084912d 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/theme/ThemeUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.manager.util.theme; +package org.lsposed.manager.util.theme; import android.content.Context; import android.content.SharedPreferences; @@ -28,8 +28,8 @@ import androidx.annotation.StyleRes; import java.util.HashMap; import java.util.Map; -import io.github.lsposed.manager.App; -import io.github.lsposed.manager.R; +import org.lsposed.manager.App; +import org.lsposed.manager.R; import rikka.core.util.ResourceUtils; import rikka.material.app.DayNightDelegate; diff --git a/app/src/main/res/layout/item_repo_release.xml b/app/src/main/res/layout/item_repo_release.xml index 17605859..91de88cd 100644 --- a/app/src/main/res/layout/item_repo_release.xml +++ b/app/src/main/res/layout/item_repo_release.xml @@ -52,7 +52,7 @@ app:layout_constraintBottom_toBottomOf="parent" tools:text="@tools:sample/lorem" /> - - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_repo_title_description.xml b/app/src/main/res/layout/item_repo_title_description.xml index b967499a..ca7402f6 100644 --- a/app/src/main/res/layout/item_repo_title_description.xml +++ b/app/src/main/res/layout/item_repo_title_description.xml @@ -50,7 +50,7 @@ app:layout_constraintBottom_toBottomOf="parent" tools:text="@tools:sample/lorem" /> - - \ No newline at end of file + diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index b1708ff8..33af34e8 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -32,7 +32,7 @@ - + android:targetClass="orrg.lsposed.manager.ui.activity.ModulesActivity" + android:targetPackage="orrg.lsposed.manager" /> + android:targetClass="orrg.lsposed.manager.ui.activity.LogsActivity" + android:targetPackage="orrg.lsposed.manager" /> + android:targetClass="orrg.lsposed.manager.ui.activity.RepoActivity" + android:targetPackage="orrg.lsposed.manager" /> - \ No newline at end of file + diff --git a/build.gradle.kts b/build.gradle.kts index 65f13371..2bf24597 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,8 +28,8 @@ buildscript { } } dependencies { - classpath("com.android.tools:r8:3.0.26-dev") - classpath("com.android.tools.build:gradle:7.0.0-alpha08") + classpath("com.android.tools:r8:3.0.27-dev") + classpath("com.android.tools.build:gradle:7.0.0-alpha09") classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r") classpath(kotlin("gradle-plugin", version = "1.4.31")) } @@ -39,9 +39,9 @@ val repo = FileRepository(rootProject.file(".git")) val refId = repo.refDatabase.exactRef("refs/remotes/origin/master").objectId!! val commitCount = Git(repo).log().add(refId).call().count() -val defaultManagerPackageName by extra("io.github.lsposed.manager") +val defaultManagerPackageName by extra("org.lsposed.manager") val verCode by extra(commitCount + 4200) -val verName by extra("v1.3.1") +val verName by extra("v1.3.2") val androidTargetSdkVersion by extra(30) val androidMinSdkVersion by extra(27) val androidBuildToolsVersion by extra("30.0.3") diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 36d86f27..1703743d 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -83,7 +83,7 @@ android { } defaultConfig { - applicationId("io.github.lsposed.lspd") + applicationId("org.lsposed.lspd") minSdkVersion(androidMinSdkVersion) targetSdkVersion(androidTargetSdkVersion) multiDexEnabled = false diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro index 91b40d47..c0c37dc3 100644 --- a/core/proguard-rules.pro +++ b/core/proguard-rules.pro @@ -25,23 +25,23 @@ -keepclassmembers class * implements android.os.Parcelable { public static final ** CREATOR; } --keepclasseswithmembers class io.github.lsposed.lspd.core.Main { +-keepclasseswithmembers class org.lsposed.lspd.core.Main { public static void forkSystemServerPost(android.os.IBinder); public static void forkAndSpecializePost(java.lang.String, java.lang.String, android.os.IBinder); public static void main(java.lang.String[]); } --keepnames class io.github.lsposed.lspd.hooker.HandleBindAppHooker +-keepnames class org.lsposed.lspd.hooker.HandleBindAppHooker -keepclasseswithmembers,includedescriptorclasses class * { native ; } --keepclasseswithmembers class io.github.lsposed.lspd.nativebridge.ClassLinker { +-keepclasseswithmembers class org.lsposed.lspd.nativebridge.ClassLinker { public static void onPostFixupStaticTrampolines(java.lang.Class); } --keepclasseswithmembers class io.github.lsposed.lspd.service.BridgeService { +-keepclasseswithmembers class org.lsposed.lspd.service.BridgeService { public static boolean execTransact(int, long, long, int); public static android.os.IBinder getApplicationServiceForSystemServer(android.os.IBinder, android.os.IBinder); } --keepclasseswithmembers class io.github.lsposed.lspd.service.ConfigManager { +-keepclasseswithmembers class org.lsposed.lspd.service.ConfigManager { public static void main(java.lang.String[]); } -assumenosideeffects class android.util.Log { diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index f2842da7..1f659bee 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -18,4 +18,4 @@ ~ Copyright (C) 2021 LSPosed Contributors --> - + diff --git a/core/src/main/aidl/io/github/lsposed/lspd/service/ILSPApplicationService.aidl b/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl similarity index 90% rename from core/src/main/aidl/io/github/lsposed/lspd/service/ILSPApplicationService.aidl rename to core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl index e878961d..9d2f30e1 100644 --- a/core/src/main/aidl/io/github/lsposed/lspd/service/ILSPApplicationService.aidl +++ b/core/src/main/aidl/org/lsposed/lspd/service/ILSPApplicationService.aidl @@ -1,4 +1,4 @@ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; interface ILSPApplicationService { IBinder requestModuleBinder() = 2; diff --git a/core/src/main/aidl/io/github/lsposed/lspd/service/ILSPosedService.aidl b/core/src/main/aidl/org/lsposed/lspd/service/ILSPosedService.aidl similarity index 72% rename from core/src/main/aidl/io/github/lsposed/lspd/service/ILSPosedService.aidl rename to core/src/main/aidl/org/lsposed/lspd/service/ILSPosedService.aidl index 918be3fe..ead17fbf 100644 --- a/core/src/main/aidl/io/github/lsposed/lspd/service/ILSPosedService.aidl +++ b/core/src/main/aidl/org/lsposed/lspd/service/ILSPosedService.aidl @@ -1,6 +1,6 @@ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; -import io.github.lsposed.lspd.service.ILSPApplicationService; +import org.lsposed.lspd.service.ILSPApplicationService; interface ILSPosedService { ILSPApplicationService requestApplicationService(int uid, int pid, String processName, IBinder heartBeat) = 1; diff --git a/core/src/main/cpp/main/include/config.h b/core/src/main/cpp/main/include/config.h index 302d66ff..55d0d068 100644 --- a/core/src/main/cpp/main/include/config.h +++ b/core/src/main/cpp/main/include/config.h @@ -48,9 +48,9 @@ inline constexpr bool is64 = Is64(); # define LP_SELECT(lp32, lp64) lp32 #endif - static const auto kEntryClassName = "io.github.lsposed.lspd.core.Main"s; - static const auto kClassLinkerClassName = "io.github.lsposed.lspd.nativebridge.ClassLinker"s; - static const auto kBridgeServiceClassName = "io.github.lsposed.lspd.service.BridgeService"s; + static const auto kEntryClassName = "org.lsposed.lspd.core.Main"s; + static const auto kClassLinkerClassName = "org.lsposed.lspd.nativebridge.ClassLinker"s; + static const auto kBridgeServiceClassName = "org.lsposed.lspd.service.BridgeService"s; static const auto kDexPath = "/data/adb/lspd/framework/lspd.dex"s; static const auto kLibArtName = "libart.so"s; diff --git a/core/src/main/cpp/main/include/native_util.h b/core/src/main/cpp/main/include/native_util.h index 9fde3031..fe33c3a4 100644 --- a/core/src/main/cpp/main/include/native_util.h +++ b/core/src/main/cpp/main/include/native_util.h @@ -65,7 +65,7 @@ namespace lspd { #endif #define REGISTER_LSP_NATIVE_METHODS(class_name) \ - RegisterNativeMethodsInternal(env, "io.github.lsposed.lspd.nativebridge." #class_name, gMethods, arraysize(gMethods)) + RegisterNativeMethodsInternal(env, "org.lsposed.lspd.nativebridge." #class_name, gMethods, arraysize(gMethods)) } // namespace lspd diff --git a/core/src/main/java/android/content/res/XResources.java b/core/src/main/java/android/content/res/XResources.java index 1c27dec4..227d27f7 100644 --- a/core/src/main/java/android/content/res/XResources.java +++ b/core/src/main/java/android/content/res/XResources.java @@ -27,7 +27,6 @@ import android.graphics.Color; import android.graphics.Movie; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.os.Build; import android.os.StrictMode; import android.text.Html; import android.util.AttributeSet; @@ -63,7 +62,7 @@ import static de.robv.android.xposed.XposedHelpers.getIntField; import static de.robv.android.xposed.XposedHelpers.getLongField; import static de.robv.android.xposed.XposedHelpers.getObjectField; import static de.robv.android.xposed.XposedHelpers.incrementMethodDepth; -import static io.github.lsposed.lspd.nativebridge.ResourcesHook.rewriteXmlReferencesNative; +import static org.lsposed.lspd.nativebridge.ResourcesHook.rewriteXmlReferencesNative; /** * {@link android.content.res.Resources} subclass that allows replacing individual resources. diff --git a/core/src/main/java/de/robv/android/xposed/PendingHooks.java b/core/src/main/java/de/robv/android/xposed/PendingHooks.java index d19f44ea..e50ea849 100644 --- a/core/src/main/java/de/robv/android/xposed/PendingHooks.java +++ b/core/src/main/java/de/robv/android/xposed/PendingHooks.java @@ -21,14 +21,13 @@ package de.robv.android.xposed; import java.lang.reflect.Executable; -import java.lang.reflect.Member; import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import io.github.lsposed.lspd.yahfa.hooker.YahfaHooker; +import org.lsposed.lspd.yahfa.hooker.YahfaHooker; -import static io.github.lsposed.lspd.nativebridge.PendingHooks.recordPendingMethodNative; +import static org.lsposed.lspd.nativebridge.PendingHooks.recordPendingMethodNative; public final class PendingHooks { diff --git a/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java index 071582cb..d2501d8b 100644 --- a/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java +++ b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java @@ -28,8 +28,8 @@ import android.preference.PreferenceManager; import android.util.Log; import com.android.internal.util.XmlUtils; -import io.github.lsposed.lspd.BuildConfig; -import io.github.lsposed.lspd.util.MetaDataReader; +import org.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.util.MetaDataReader; import org.xmlpull.v1.XmlPullParserException; @@ -52,7 +52,7 @@ import java.util.Set; import de.robv.android.xposed.services.FileResult; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; /** * This class is basically the same as SharedPreferencesImpl from AOSP, but diff --git a/core/src/main/java/de/robv/android/xposed/XposedBridge.java b/core/src/main/java/de/robv/android/xposed/XposedBridge.java index f86baf8c..b45af892 100644 --- a/core/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/core/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -24,7 +24,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.util.Log; -import io.github.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.BuildConfig; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Executable; @@ -41,10 +41,10 @@ import java.util.Set; import de.robv.android.xposed.callbacks.XC_InitPackageResources; import de.robv.android.xposed.callbacks.XC_InitZygote; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.lsposed.lspd.nativebridge.ModuleLogger; -import io.github.lsposed.lspd.nativebridge.ResourcesHook; -import io.github.lsposed.lspd.yahfa.dexmaker.DynamicBridge; -import io.github.lsposed.lspd.yahfa.hooker.YahfaHooker; +import org.lsposed.lspd.nativebridge.ModuleLogger; +import org.lsposed.lspd.nativebridge.ResourcesHook; +import org.lsposed.lspd.yahfa.dexmaker.DynamicBridge; +import org.lsposed.lspd.yahfa.hooker.YahfaHooker; import static de.robv.android.xposed.XposedHelpers.setObjectField; diff --git a/core/src/main/java/de/robv/android/xposed/XposedInit.java b/core/src/main/java/de/robv/android/xposed/XposedInit.java index b5b80a06..f73ae1a8 100644 --- a/core/src/main/java/de/robv/android/xposed/XposedInit.java +++ b/core/src/main/java/de/robv/android/xposed/XposedInit.java @@ -54,8 +54,8 @@ import de.robv.android.xposed.callbacks.XC_InitZygote; import de.robv.android.xposed.callbacks.XC_LoadPackage; import de.robv.android.xposed.callbacks.XCallback; import hidden.HiddenApiBridge; -import io.github.lsposed.lspd.nativebridge.NativeAPI; -import io.github.lsposed.lspd.nativebridge.ResourcesHook; +import org.lsposed.lspd.nativebridge.NativeAPI; +import org.lsposed.lspd.nativebridge.ResourcesHook; import static de.robv.android.xposed.XposedBridge.hookAllMethods; import static de.robv.android.xposed.XposedBridge.sInitPackageResourcesCallbacks; @@ -71,7 +71,7 @@ import static de.robv.android.xposed.XposedHelpers.getParameterIndexByType; import static de.robv.android.xposed.XposedHelpers.setStaticBooleanField; import static de.robv.android.xposed.XposedHelpers.setStaticLongField; import static de.robv.android.xposed.XposedHelpers.setStaticObjectField; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; public final class XposedInit { private static final String TAG = XposedBridge.TAG; diff --git a/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java b/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java index 7e328108..284a3080 100644 --- a/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java +++ b/core/src/main/java/de/robv/android/xposed/callbacks/XCallback.java @@ -27,7 +27,7 @@ import java.io.Serializable; import de.robv.android.xposed.IModuleContext; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedBridge.CopyOnWriteSortedSet; -import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import org.lsposed.lspd.deopt.PrebuiltMethodsDeopter; /** * Base class for Xposed callbacks. diff --git a/core/src/main/java/io/github/lsposed/lspd/config/LSPApplicationServiceClient.java b/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java similarity index 95% rename from core/src/main/java/io/github/lsposed/lspd/config/LSPApplicationServiceClient.java rename to core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java index 63db3abc..8336e783 100644 --- a/core/src/main/java/io/github/lsposed/lspd/config/LSPApplicationServiceClient.java +++ b/core/src/main/java/org/lsposed/lspd/config/LSPApplicationServiceClient.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.config; +package org.lsposed.lspd.config; import android.os.IBinder; import android.os.ParcelFileDescriptor; @@ -25,9 +25,8 @@ import android.os.RemoteException; import java.io.File; -import io.github.lsposed.lspd.service.ConfigManager; -import io.github.lsposed.lspd.service.ILSPApplicationService; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.service.ILSPApplicationService; +import org.lsposed.lspd.util.Utils; public class LSPApplicationServiceClient implements ILSPApplicationService { static ILSPApplicationService service = null; diff --git a/core/src/main/java/io/github/lsposed/lspd/core/Main.java b/core/src/main/java/org/lsposed/lspd/core/Main.java similarity index 85% rename from core/src/main/java/io/github/lsposed/lspd/core/Main.java rename to core/src/main/java/org/lsposed/lspd/core/Main.java index 38d32f33..9ee95bcd 100644 --- a/core/src/main/java/io/github/lsposed/lspd/core/Main.java +++ b/core/src/main/java/org/lsposed/lspd/core/Main.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.core; +package org.lsposed.lspd.core; import android.annotation.SuppressLint; import android.app.ActivityThread; @@ -29,24 +29,23 @@ import android.os.Environment; import android.os.IBinder; import java.io.File; -import java.util.concurrent.atomic.AtomicReference; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.XposedInit; -import io.github.lsposed.lspd.config.LSPApplicationServiceClient; -import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; -import io.github.lsposed.lspd.hooker.HandleBindAppHooker; -import io.github.lsposed.lspd.hooker.LoadedApkCstrHooker; -import io.github.lsposed.lspd.hooker.StartBootstrapServicesHooker; -import io.github.lsposed.lspd.hooker.SystemMainHooker; -import io.github.lsposed.lspd.nativebridge.ModuleLogger; -import io.github.lsposed.lspd.service.ServiceManager; -import io.github.lsposed.lspd.util.Utils; -import io.github.lsposed.lspd.util.Versions; -import io.github.lsposed.lspd.yahfa.hooker.YahfaHooker; +import org.lsposed.lspd.config.LSPApplicationServiceClient; +import org.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import org.lsposed.lspd.hooker.HandleBindAppHooker; +import org.lsposed.lspd.hooker.LoadedApkCstrHooker; +import org.lsposed.lspd.hooker.StartBootstrapServicesHooker; +import org.lsposed.lspd.hooker.SystemMainHooker; +import org.lsposed.lspd.nativebridge.ModuleLogger; +import org.lsposed.lspd.service.ServiceManager; +import org.lsposed.lspd.util.Utils; +import org.lsposed.lspd.util.Versions; +import org.lsposed.lspd.yahfa.hooker.YahfaHooker; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; @SuppressLint("DefaultLocale") public class Main { diff --git a/core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java b/core/src/main/java/org/lsposed/lspd/core/yahfa/HookMain.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java rename to core/src/main/java/org/lsposed/lspd/core/yahfa/HookMain.java index ab7728d2..25b9ee77 100644 --- a/core/src/main/java/io/github/lsposed/lspd/core/yahfa/HookMain.java +++ b/core/src/main/java/org/lsposed/lspd/core/yahfa/HookMain.java @@ -18,11 +18,10 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.core.yahfa; +package org.lsposed.lspd.core.yahfa; -import io.github.lsposed.lspd.nativebridge.Yahfa; -import io.github.lsposed.lspd.util.Logger; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.nativebridge.Yahfa; +import org.lsposed.lspd.util.Utils; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; diff --git a/core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java b/core/src/main/java/org/lsposed/lspd/deopt/InlinedMethodCallers.java similarity index 99% rename from core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java rename to core/src/main/java/org/lsposed/lspd/deopt/InlinedMethodCallers.java index 2deccfb1..2de51c14 100644 --- a/core/src/main/java/io/github/lsposed/lspd/deopt/InlinedMethodCallers.java +++ b/core/src/main/java/org/lsposed/lspd/deopt/InlinedMethodCallers.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.deopt; +package org.lsposed.lspd.deopt; import java.util.HashMap; diff --git a/core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java b/core/src/main/java/org/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java similarity index 81% rename from core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java rename to core/src/main/java/org/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java index 8bca8a5c..48688e4c 100644 --- a/core/src/main/java/io/github/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java +++ b/core/src/main/java/org/lsposed/lspd/deopt/PrebuiltMethodsDeopter.java @@ -18,23 +18,23 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.deopt; +package org.lsposed.lspd.deopt; import android.text.TextUtils; -import io.github.lsposed.lspd.nativebridge.Yahfa; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.nativebridge.Yahfa; +import org.lsposed.lspd.util.Utils; import java.lang.reflect.Executable; import java.util.Arrays; import de.robv.android.xposed.XposedHelpers; -import io.github.lsposed.lspd.yahfa.hooker.YahfaHooker; +import org.lsposed.lspd.yahfa.hooker.YahfaHooker; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; -import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE; -import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE_MIUI_RES; -import static io.github.lsposed.lspd.deopt.InlinedMethodCallers.KEY_SYSTEM_SERVER; +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import static org.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE; +import static org.lsposed.lspd.deopt.InlinedMethodCallers.KEY_BOOT_IMAGE_MIUI_RES; +import static org.lsposed.lspd.deopt.InlinedMethodCallers.KEY_SYSTEM_SERVER; public class PrebuiltMethodsDeopter { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/HandleBindAppHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/HandleBindAppHooker.java similarity index 95% rename from core/src/main/java/io/github/lsposed/lspd/hooker/HandleBindAppHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/HandleBindAppHooker.java index 59bafe75..3ac3556f 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/HandleBindAppHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/HandleBindAppHooker.java @@ -18,22 +18,21 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; import android.annotation.SuppressLint; import android.app.ActivityThread; import android.app.ContextImpl; import android.app.LoadedApk; -import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.content.res.XResources; import android.os.IBinder; -import io.github.lsposed.lspd.util.Hookers; -import io.github.lsposed.lspd.util.MetaDataReader; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.util.Hookers; +import org.lsposed.lspd.util.MetaDataReader; +import org.lsposed.lspd.util.Utils; import java.io.File; import java.io.IOException; @@ -42,11 +41,10 @@ import java.nio.file.Path; import java.util.Map; import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.XposedInit; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; // normal process initialization (for new Activity, Service, BroadcastReceiver etc.) public class HandleBindAppHooker extends XC_MethodHook { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkCstrHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkCstrHooker.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkCstrHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/LoadedApkCstrHooker.java index 0c52a9a3..3268ebe4 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkCstrHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkCstrHooker.java @@ -18,14 +18,14 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; import android.app.AndroidAppHelper; import android.app.LoadedApk; import android.content.res.XResources; import android.util.Log; -import io.github.lsposed.lspd.util.Hookers; +import org.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedHelpers; diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkGetCLHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java similarity index 92% rename from core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkGetCLHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java index fec28f8d..160fb760 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/LoadedApkGetCLHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/LoadedApkGetCLHooker.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; import android.app.LoadedApk; import android.os.IBinder; @@ -27,11 +27,11 @@ import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import io.github.lsposed.lspd.hooker.XposedInstallerHooker; -import io.github.lsposed.lspd.util.Hookers; -import io.github.lsposed.lspd.util.InstallerVerifier; -import static io.github.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; +import org.lsposed.lspd.util.Hookers; +import org.lsposed.lspd.util.InstallerVerifier; + +import static org.lsposed.lspd.config.LSPApplicationServiceClient.serviceClient; public class LoadedApkGetCLHooker extends XC_MethodHook { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java similarity index 95% rename from core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java index 27cff843..86265522 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/StartBootstrapServicesHooker.java @@ -18,11 +18,11 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; import android.os.Build; -import io.github.lsposed.lspd.util.Hookers; +import org.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.XC_MethodReplacement; @@ -31,7 +31,7 @@ import de.robv.android.xposed.XposedHelpers; import de.robv.android.xposed.XposedInit; import de.robv.android.xposed.callbacks.XC_LoadPackage; -import static io.github.lsposed.lspd.util.Utils.logD; +import static org.lsposed.lspd.util.Utils.logD; import static de.robv.android.xposed.XposedHelpers.findAndHookMethod; public class StartBootstrapServicesHooker extends XC_MethodHook { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/SystemMainHooker.java similarity index 87% rename from core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/SystemMainHooker.java index d29ebfd8..c9078e5e 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/SystemMainHooker.java @@ -18,14 +18,13 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; -import io.github.lsposed.lspd.core.Main; -import io.github.lsposed.lspd.deopt.PrebuiltMethodsDeopter; -import io.github.lsposed.lspd.util.Hookers; +import org.lsposed.lspd.core.Main; +import org.lsposed.lspd.deopt.PrebuiltMethodsDeopter; +import org.lsposed.lspd.util.Hookers; import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.XposedBridge; // system_server initialization // ed: only support sdk >= 21 for now diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java b/core/src/main/java/org/lsposed/lspd/hooker/XposedInstallerHooker.java similarity index 82% rename from core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java rename to core/src/main/java/org/lsposed/lspd/hooker/XposedInstallerHooker.java index d82e15d6..a351b603 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/XposedInstallerHooker.java +++ b/core/src/main/java/org/lsposed/lspd/hooker/XposedInstallerHooker.java @@ -18,21 +18,21 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.hooker; +package org.lsposed.lspd.hooker; import android.os.IBinder; import de.robv.android.xposed.XC_MethodReplacement; import de.robv.android.xposed.XposedHelpers; -import io.github.lsposed.lspd.BuildConfig; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.util.Utils; public class XposedInstallerHooker { public static void hookXposedInstaller(final ClassLoader classLoader, IBinder binder) { Utils.logI("Found LSPosed Manager, hooking it"); try { - Class serviceClass = XposedHelpers.findClass("io.github.lsposed.manager.receivers.LSPosedManagerServiceClient", classLoader); + Class serviceClass = XposedHelpers.findClass("org.lsposed.manager.receivers.LSPosedManagerServiceClient", classLoader); XposedHelpers.setStaticObjectField(serviceClass, "binder", binder); Utils.logI("Hooked LSPosed Manager"); @@ -42,7 +42,7 @@ public class XposedInstallerHooker { // for showing the version mismatch dialog try { - Class ConstantsClass = XposedHelpers.findClass("io.github.lsposed.manager.Constants", classLoader); + Class ConstantsClass = XposedHelpers.findClass("org.lsposed.manager.Constants", classLoader); try { XposedHelpers.setStaticObjectField(ConstantsClass, "xposedVersion", BuildConfig.VERSION_NAME); return; diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ClassLinker.java b/core/src/main/java/org/lsposed/lspd/nativebridge/ClassLinker.java similarity index 93% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/ClassLinker.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/ClassLinker.java index 5f817527..f9c30609 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ClassLinker.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/ClassLinker.java @@ -18,10 +18,9 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; import java.lang.reflect.Executable; -import java.lang.reflect.Member; import de.robv.android.xposed.PendingHooks; diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ModuleLogger.java b/core/src/main/java/org/lsposed/lspd/nativebridge/ModuleLogger.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/ModuleLogger.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/ModuleLogger.java index 424166a2..f14f6267 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ModuleLogger.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/ModuleLogger.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; import android.app.ActivityThread; import android.os.ParcelFileDescriptor; @@ -29,7 +29,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.util.Utils; public class ModuleLogger { static SimpleDateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss", Locale.getDefault()); diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/NativeAPI.java b/core/src/main/java/org/lsposed/lspd/nativebridge/NativeAPI.java similarity index 95% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/NativeAPI.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/NativeAPI.java index 1cb4bf73..eeca6134 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/NativeAPI.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/NativeAPI.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; public class NativeAPI { public static native void recordNativeEntrypoint(String library_name); diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/PendingHooks.java b/core/src/main/java/org/lsposed/lspd/nativebridge/PendingHooks.java similarity index 95% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/PendingHooks.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/PendingHooks.java index 7580de63..12a9f3b4 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/PendingHooks.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/PendingHooks.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; import java.lang.reflect.Method; diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ResourcesHook.java b/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/ResourcesHook.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java index 13ba1fc0..34f4c319 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/ResourcesHook.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/ResourcesHook.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; import android.content.res.Resources; import android.content.res.XResources; diff --git a/core/src/main/java/io/github/lsposed/lspd/nativebridge/Yahfa.java b/core/src/main/java/org/lsposed/lspd/nativebridge/Yahfa.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/nativebridge/Yahfa.java rename to core/src/main/java/org/lsposed/lspd/nativebridge/Yahfa.java index 28c9e17f..adfea0d5 100644 --- a/core/src/main/java/io/github/lsposed/lspd/nativebridge/Yahfa.java +++ b/core/src/main/java/org/lsposed/lspd/nativebridge/Yahfa.java @@ -18,10 +18,9 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.nativebridge; +package org.lsposed.lspd.nativebridge; import java.lang.reflect.Executable; -import java.lang.reflect.Member; import java.lang.reflect.Method; public class Yahfa { diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ActivityManagerService.java b/core/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/service/ActivityManagerService.java rename to core/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java index 379a4ce1..c58a043b 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/ActivityManagerService.java +++ b/core/src/main/java/org/lsposed/lspd/service/ActivityManagerService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.app.IActivityManager; import android.app.IApplicationThread; @@ -29,7 +29,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class ActivityManagerService { private static IActivityManager am = null; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/BootReceiver.java b/core/src/main/java/org/lsposed/lspd/service/BootReceiver.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/service/BootReceiver.java rename to core/src/main/java/org/lsposed/lspd/service/BootReceiver.java index eb02b1e6..58118f8c 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/BootReceiver.java +++ b/core/src/main/java/org/lsposed/lspd/service/BootReceiver.java @@ -1,4 +1,4 @@ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.annotation.SuppressLint; import android.app.ActivityThread; @@ -10,7 +10,7 @@ import android.os.Handler; import android.os.HandlerThread; import java.lang.reflect.Method; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.util.Utils; public class BootReceiver { public static void register(BroadcastReceiver receiver) { diff --git a/core/src/main/java/io/github/lsposed/lspd/service/BridgeService.java b/core/src/main/java/org/lsposed/lspd/service/BridgeService.java similarity index 99% rename from core/src/main/java/io/github/lsposed/lspd/service/BridgeService.java rename to core/src/main/java/org/lsposed/lspd/service/BridgeService.java index 23536fb9..79dea6d8 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/BridgeService.java +++ b/core/src/main/java/org/lsposed/lspd/service/BridgeService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.BroadcastReceiver; import android.content.Context; @@ -46,7 +46,7 @@ import java.util.ArrayList; import java.util.Map; import static hidden.HiddenApiBridge.Binder_allowBlocking; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class BridgeService { private static final int TRANSACTION_CODE = ('_' << 24) | ('L' << 16) | ('S' << 8) | 'P'; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java similarity index 99% rename from core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java rename to core/src/main/java/org/lsposed/lspd/service/ConfigManager.java index cce12ac6..02fd490f 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/ConfigManager.java +++ b/core/src/main/java/org/lsposed/lspd/service/ConfigManager.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.ContentValues; import android.content.pm.PackageInfo; @@ -59,10 +59,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.Application; +import org.lsposed.lspd.BuildConfig; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; // This config manager assume uid won't change when our service is off. // Otherwise, user should maintain it manually. @@ -202,7 +202,7 @@ public class ConfigManager { private static void writeText(@NonNull File file, String value) { try { - Files.write(file.toPath(), value.getBytes(), StandardOpenOption.CREATE); + Files.write(file.toPath(), value.getBytes(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); } catch (IOException e) { Log.e(TAG, Log.getStackTraceString(e)); } diff --git a/core/src/main/java/io/github/lsposed/lspd/service/LSPApplicationService.java b/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/service/LSPApplicationService.java rename to core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java index 30084fdf..fa4b8cbe 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/LSPApplicationService.java +++ b/core/src/main/java/org/lsposed/lspd/service/LSPApplicationService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.os.Binder; import android.os.IBinder; @@ -29,7 +29,7 @@ import android.util.Pair; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class LSPApplicationService extends ILSPApplicationService.Stub { // diff --git a/core/src/main/java/io/github/lsposed/lspd/service/LSPManagerService.java b/core/src/main/java/org/lsposed/lspd/service/LSPManagerService.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/service/LSPManagerService.java rename to core/src/main/java/org/lsposed/lspd/service/LSPManagerService.java index 2e3f1023..4bfb133e 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/LSPManagerService.java +++ b/core/src/main/java/org/lsposed/lspd/service/LSPManagerService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -31,12 +31,12 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; import de.robv.android.xposed.XposedBridge; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.lspd.BuildConfig; -import io.github.lsposed.lspd.ILSPManagerService; -import io.github.lsposed.lspd.utils.ParceledListSlice; +import org.lsposed.lspd.Application; +import org.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.ILSPManagerService; +import org.lsposed.lspd.utils.ParceledListSlice; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class LSPManagerService extends ILSPManagerService.Stub { diff --git a/core/src/main/java/io/github/lsposed/lspd/service/LSPModuleService.java b/core/src/main/java/org/lsposed/lspd/service/LSPModuleService.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/service/LSPModuleService.java rename to core/src/main/java/org/lsposed/lspd/service/LSPModuleService.java index f7227d0e..dc3e19bb 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/LSPModuleService.java +++ b/core/src/main/java/org/lsposed/lspd/service/LSPModuleService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.os.IBinder; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/LSPosedService.java b/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/service/LSPosedService.java rename to core/src/main/java/org/lsposed/lspd/service/LSPosedService.java index 41d55746..7487527e 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/LSPosedService.java +++ b/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -30,10 +30,10 @@ import android.util.Log; import java.util.Arrays; -import io.github.lsposed.lspd.Application; +import org.lsposed.lspd.Application; import pxb.android.arsc.Config; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class LSPosedService extends ILSPosedService.Stub { @Override @@ -96,7 +96,7 @@ public class LSPosedService extends ILSPosedService.Stub { Log.d(TAG, "Updated module apk path: " + packageName); boolean enabled = Arrays.asList(ConfigManager.getInstance().enabledModules()).contains(packageName); - Intent broadcastIntent = new Intent(enabled ? "io.github.lsposed.action.MODULE_UPDATED" : "io.github.lsposed.action.MODULE_NOT_ACTIVATAED"); + Intent broadcastIntent = new Intent(enabled ? "org.lsposed.action.MODULE_UPDATED" : "org.lsposed.action.MODULE_NOT_ACTIVATAED"); broadcastIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); broadcastIntent.addFlags(0x01000000); broadcastIntent.addFlags(0x00400000); diff --git a/core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java b/core/src/main/java/org/lsposed/lspd/service/PackageReceiver.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java rename to core/src/main/java/org/lsposed/lspd/service/PackageReceiver.java index 72161678..f62a0f06 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/PackageReceiver.java +++ b/core/src/main/java/org/lsposed/lspd/service/PackageReceiver.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.annotation.SuppressLint; import android.app.ActivityThread; @@ -33,7 +33,7 @@ import android.os.UserHandle; import java.lang.reflect.Field; import java.lang.reflect.Method; -import io.github.lsposed.lspd.util.Utils; +import org.lsposed.lspd.util.Utils; public class PackageReceiver { public static void register(BroadcastReceiver receiver) { diff --git a/core/src/main/java/io/github/lsposed/lspd/service/PackageService.java b/core/src/main/java/org/lsposed/lspd/service/PackageService.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/service/PackageService.java rename to core/src/main/java/org/lsposed/lspd/service/PackageService.java index 0e38a701..1fefa654 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/PackageService.java +++ b/core/src/main/java/org/lsposed/lspd/service/PackageService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.IIntentReceiver; import android.content.IIntentSender; @@ -54,13 +54,13 @@ import java.util.concurrent.CountDownLatch; import java.util.stream.Collectors; import hidden.HiddenApiBridge; -import io.github.lsposed.lspd.Application; -import io.github.lsposed.lspd.BuildConfig; -import io.github.lsposed.lspd.util.InstallerVerifier; -import io.github.lsposed.lspd.utils.ParceledListSlice; +import org.lsposed.lspd.Application; +import org.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.util.InstallerVerifier; +import org.lsposed.lspd.utils.ParceledListSlice; import static android.content.pm.ServiceInfo.FLAG_ISOLATED_PROCESS; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class PackageService { private static IPackageManager pm = null; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ParcelUtils.java b/core/src/main/java/org/lsposed/lspd/service/ParcelUtils.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/service/ParcelUtils.java rename to core/src/main/java/org/lsposed/lspd/service/ParcelUtils.java index b9558701..837f7776 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/ParcelUtils.java +++ b/core/src/main/java/org/lsposed/lspd/service/ParcelUtils.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.os.Build; import android.os.Parcel; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/PowerService.java b/core/src/main/java/org/lsposed/lspd/service/PowerService.java similarity index 92% rename from core/src/main/java/io/github/lsposed/lspd/service/PowerService.java rename to core/src/main/java/org/lsposed/lspd/service/PowerService.java index e7572620..f3f81b4a 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/PowerService.java +++ b/core/src/main/java/org/lsposed/lspd/service/PowerService.java @@ -1,4 +1,4 @@ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.os.IBinder; import android.os.IPowerManager; @@ -6,7 +6,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class PowerService { private static IPowerManager pm = null; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/ServiceManager.java b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java similarity index 99% rename from core/src/main/java/io/github/lsposed/lspd/service/ServiceManager.java rename to core/src/main/java/org/lsposed/lspd/service/ServiceManager.java index 5f78e40f..7c765b65 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/ServiceManager.java +++ b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.Context; import android.os.IBinder; diff --git a/core/src/main/java/io/github/lsposed/lspd/service/SystemService.java b/core/src/main/java/org/lsposed/lspd/service/SystemService.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/service/SystemService.java rename to core/src/main/java/org/lsposed/lspd/service/SystemService.java index 081a5a24..36854dec 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/SystemService.java +++ b/core/src/main/java/org/lsposed/lspd/service/SystemService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; public class SystemService { } diff --git a/core/src/main/java/io/github/lsposed/lspd/service/UserService.java b/core/src/main/java/org/lsposed/lspd/service/UserService.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/service/UserService.java rename to core/src/main/java/org/lsposed/lspd/service/UserService.java index cdf8a737..e5bf8d70 100644 --- a/core/src/main/java/io/github/lsposed/lspd/service/UserService.java +++ b/core/src/main/java/org/lsposed/lspd/service/UserService.java @@ -17,7 +17,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.service; +package org.lsposed.lspd.service; import android.content.pm.UserInfo; import android.os.Build; @@ -29,7 +29,7 @@ import android.util.Log; import java.util.List; -import static io.github.lsposed.lspd.service.ServiceManager.TAG; +import static org.lsposed.lspd.service.ServiceManager.TAG; public class UserService { private static IUserManager um = null; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java b/core/src/main/java/org/lsposed/lspd/util/ClassUtils.java similarity index 98% rename from core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java rename to core/src/main/java/org/lsposed/lspd/util/ClassUtils.java index 25139d9f..911cb875 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/ClassUtils.java +++ b/core/src/main/java/org/lsposed/lspd/util/ClassUtils.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.os.Build; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/Hookers.java b/core/src/main/java/org/lsposed/lspd/util/Hookers.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/util/Hookers.java rename to core/src/main/java/org/lsposed/lspd/util/Hookers.java index ce81fc1a..c878c7a5 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/Hookers.java +++ b/core/src/main/java/org/lsposed/lspd/util/Hookers.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.app.AndroidAppHelper; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/InstallerVerifier.java b/core/src/main/java/org/lsposed/lspd/util/InstallerVerifier.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/util/InstallerVerifier.java rename to core/src/main/java/org/lsposed/lspd/util/InstallerVerifier.java index d436533f..f29fd583 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/InstallerVerifier.java +++ b/core/src/main/java/org/lsposed/lspd/util/InstallerVerifier.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -58,7 +58,7 @@ public class InstallerVerifier { public static void hookXposedInstaller(final ClassLoader classLoader) { try { - Class ConstantsClass = XposedHelpers.findClass("io.github.lsposed.manager.Constants", classLoader); + Class ConstantsClass = XposedHelpers.findClass("org.lsposed.manager.Constants", classLoader); XposedHelpers.findAndHookMethod(android.app.Activity.class, "onCreate", Bundle.class, new XC_MethodHook() { @Override protected void afterHookedMethod(MethodHookParam param) { diff --git a/core/src/main/java/io/github/lsposed/lspd/util/Logger.java b/core/src/main/java/org/lsposed/lspd/util/Logger.java similarity index 93% rename from core/src/main/java/io/github/lsposed/lspd/util/Logger.java rename to core/src/main/java/org/lsposed/lspd/util/Logger.java index 7b6128d2..e070f405 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/Logger.java +++ b/core/src/main/java/org/lsposed/lspd/util/Logger.java @@ -1,4 +1,4 @@ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.util.Log; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java b/core/src/main/java/org/lsposed/lspd/util/MetaDataReader.java similarity index 99% rename from core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java rename to core/src/main/java/org/lsposed/lspd/util/MetaDataReader.java index 8141b63c..f6daf360 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/MetaDataReader.java +++ b/core/src/main/java/org/lsposed/lspd/util/MetaDataReader.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java b/core/src/main/java/org/lsposed/lspd/util/ProxyClassLoader.java similarity index 97% rename from core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java rename to core/src/main/java/org/lsposed/lspd/util/ProxyClassLoader.java index 62f2cf4c..7ab6e898 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/ProxyClassLoader.java +++ b/core/src/main/java/org/lsposed/lspd/util/ProxyClassLoader.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; public class ProxyClassLoader extends ClassLoader { diff --git a/core/src/main/java/io/github/lsposed/lspd/util/Utils.java b/core/src/main/java/org/lsposed/lspd/util/Utils.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/util/Utils.java rename to core/src/main/java/org/lsposed/lspd/util/Utils.java index a750631d..1d4f1d48 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/Utils.java +++ b/core/src/main/java/org/lsposed/lspd/util/Utils.java @@ -18,11 +18,11 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.util.Log; -import io.github.lsposed.lspd.BuildConfig; +import org.lsposed.lspd.BuildConfig; import de.robv.android.xposed.XposedHelpers; diff --git a/core/src/main/java/io/github/lsposed/lspd/util/Versions.java b/core/src/main/java/org/lsposed/lspd/util/Versions.java similarity index 96% rename from core/src/main/java/io/github/lsposed/lspd/util/Versions.java rename to core/src/main/java/org/lsposed/lspd/util/Versions.java index 6f3772aa..1546256e 100644 --- a/core/src/main/java/io/github/lsposed/lspd/util/Versions.java +++ b/core/src/main/java/org/lsposed/lspd/util/Versions.java @@ -18,7 +18,7 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.util; +package org.lsposed.lspd.util; import android.os.Build; diff --git a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java b/core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java rename to core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java index 1b8b7078..a486e661 100644 --- a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java +++ b/core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/DynamicBridge.java @@ -18,19 +18,17 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.yahfa.dexmaker; +package org.lsposed.lspd.yahfa.dexmaker; -import java.lang.reflect.Constructor; import java.lang.reflect.Executable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Member; -import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.concurrent.ConcurrentHashMap; import de.robv.android.xposed.LspHooker; import de.robv.android.xposed.XposedBridge; -import io.github.lsposed.lspd.util.Logger; +import org.lsposed.lspd.util.Logger; public final class DynamicBridge { private static final ConcurrentHashMap hookedInfo = new ConcurrentHashMap<>(); diff --git a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java b/core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java similarity index 94% rename from core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java rename to core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java index 327407c9..74900ce2 100644 --- a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java +++ b/core/src/main/java/org/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java @@ -18,12 +18,12 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.yahfa.dexmaker; +package org.lsposed.lspd.yahfa.dexmaker; -import io.github.lsposed.lspd.core.yahfa.HookMain; -import io.github.lsposed.lspd.nativebridge.Yahfa; -import io.github.lsposed.lspd.util.Logger; -import io.github.lsposed.lspd.util.ProxyClassLoader; +import org.lsposed.lspd.core.yahfa.HookMain; +import org.lsposed.lspd.nativebridge.Yahfa; +import org.lsposed.lspd.util.Logger; +import org.lsposed.lspd.util.ProxyClassLoader; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; diff --git a/core/src/main/java/io/github/lsposed/lspd/yahfa/hooker/YahfaHooker.java b/core/src/main/java/org/lsposed/lspd/yahfa/hooker/YahfaHooker.java similarity index 85% rename from core/src/main/java/io/github/lsposed/lspd/yahfa/hooker/YahfaHooker.java rename to core/src/main/java/org/lsposed/lspd/yahfa/hooker/YahfaHooker.java index 80330aaa..bdd9c478 100644 --- a/core/src/main/java/io/github/lsposed/lspd/yahfa/hooker/YahfaHooker.java +++ b/core/src/main/java/org/lsposed/lspd/yahfa/hooker/YahfaHooker.java @@ -17,18 +17,17 @@ * Copyright (C) 2021 LSPosed Contributors */ -package io.github.lsposed.lspd.yahfa.hooker; +package org.lsposed.lspd.yahfa.hooker; import android.os.Build; import java.lang.reflect.Executable; -import java.lang.reflect.Member; import de.robv.android.xposed.XposedBridge.AdditionalHookInfo; -import io.github.lsposed.lspd.nativebridge.ClassLinker; -import io.github.lsposed.lspd.nativebridge.Yahfa; -import io.github.lsposed.lspd.yahfa.dexmaker.DynamicBridge; -import io.github.lsposed.lspd.util.ClassUtils; +import org.lsposed.lspd.nativebridge.ClassLinker; +import org.lsposed.lspd.nativebridge.Yahfa; +import org.lsposed.lspd.yahfa.dexmaker.DynamicBridge; +import org.lsposed.lspd.util.ClassUtils; public class YahfaHooker { public static void init() { diff --git a/core/template_override/customize.sh b/core/template_override/customize.sh index 5df17806..1acad843 100644 --- a/core/template_override/customize.sh +++ b/core/template_override/customize.sh @@ -205,7 +205,7 @@ if [[ ! -d /data/adb/lspd/config ]]; then mkdir -p /data/adb/lspd/config ui_print "- ${LANG_CUST_INST_MIGRATE_CONF}" cp -r /data/misc/$MISC_PATH/0/prefs /data/misc/$MISC_PATH/prefs - /system/bin/app_process -Djava.class.path=/data/adb/lspd/framework/lspd.dex /system/bin --nice-name=lspd_config io.github.lsposed.lspd.service.ConfigManager + /system/bin/app_process -Djava.class.path=/data/adb/lspd/framework/lspd.dex /system/bin --nice-name=lspd_config org.lsposed.lspd.service.ConfigManager fi echo "rm -rf /data/misc/$MISC_PATH" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" echo "[[ -f /data/adb/lspd/new_install ]] || rm -rf /data/adb/lspd" >> "${MODPATH}/uninstall.sh" || abortC "! ${LANG_CUST_ERR_CONF_UNINST}" diff --git a/core/template_override/post-fs-data.sh b/core/template_override/post-fs-data.sh index 359f2e12..2ca01c82 100644 --- a/core/template_override/post-fs-data.sh +++ b/core/template_override/post-fs-data.sh @@ -155,7 +155,7 @@ start_app_process() { while true do if [ -S "/dev/socket/zygote" ]; then - /system/bin/app_process -Djava.class.path=/data/adb/lspd/framework/lspd.dex /system/bin --nice-name=lspd io.github.lsposed.lspd.core.Main + /system/bin/app_process -Djava.class.path=/data/adb/lspd/framework/lspd.dex /system/bin --nice-name=lspd org.lsposed.lspd.core.Main fi done } diff --git a/hiddenapi-stubs/src/main/AndroidManifest.xml b/hiddenapi-stubs/src/main/AndroidManifest.xml index c264cc08..13e9e4c6 100644 --- a/hiddenapi-stubs/src/main/AndroidManifest.xml +++ b/hiddenapi-stubs/src/main/AndroidManifest.xml @@ -18,4 +18,4 @@ ~ Copyright (C) 2021 LSPosed Contributors --> - + diff --git a/manager-service/proguard-rules.pro b/manager-service/proguard-rules.pro index ac5f519c..134eea52 100644 --- a/manager-service/proguard-rules.pro +++ b/manager-service/proguard-rules.pro @@ -19,7 +19,7 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile --keepclasseswithmembers class io.github.lsposed.lspd.Application { *; } +-keepclasseswithmembers class org.lsposed.lspd.Application { *; } -keepclassmembers class * implements android.os.Parcelable { public static final ** CREATOR; } diff --git a/manager-service/src/main/AndroidManifest.xml b/manager-service/src/main/AndroidManifest.xml index 8c0c672a..85f3b62b 100644 --- a/manager-service/src/main/AndroidManifest.xml +++ b/manager-service/src/main/AndroidManifest.xml @@ -18,4 +18,4 @@ ~ Copyright (C) 2021 LSPosed Contributors --> - \ No newline at end of file + diff --git a/manager-service/src/main/aidl/io/github/lsposed/lspd/utils/ParceledListSlice.aidl b/manager-service/src/main/aidl/io/github/lsposed/lspd/utils/ParceledListSlice.aidl deleted file mode 100644 index 0ddd97fb..00000000 --- a/manager-service/src/main/aidl/io/github/lsposed/lspd/utils/ParceledListSlice.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package io.github.lsposed.lspd.utils; - -parcelable ParceledListSlice; \ No newline at end of file diff --git a/manager-service/src/main/aidl/io/github/lsposed/lspd/Application.aidl b/manager-service/src/main/aidl/org/lsposed/lspd/Application.aidl similarity index 66% rename from manager-service/src/main/aidl/io/github/lsposed/lspd/Application.aidl rename to manager-service/src/main/aidl/org/lsposed/lspd/Application.aidl index 144b33d4..6e96b7f2 100644 --- a/manager-service/src/main/aidl/io/github/lsposed/lspd/Application.aidl +++ b/manager-service/src/main/aidl/org/lsposed/lspd/Application.aidl @@ -1,6 +1,6 @@ -package io.github.lsposed.lspd; +package org.lsposed.lspd; parcelable Application { String packageName; int userId; -} \ No newline at end of file +} diff --git a/manager-service/src/main/aidl/io/github/lsposed/lspd/ILSPManagerService.aidl b/manager-service/src/main/aidl/org/lsposed/lspd/ILSPManagerService.aidl similarity index 90% rename from manager-service/src/main/aidl/io/github/lsposed/lspd/ILSPManagerService.aidl rename to manager-service/src/main/aidl/org/lsposed/lspd/ILSPManagerService.aidl index 66469d09..84aaa00b 100644 --- a/manager-service/src/main/aidl/io/github/lsposed/lspd/ILSPManagerService.aidl +++ b/manager-service/src/main/aidl/org/lsposed/lspd/ILSPManagerService.aidl @@ -1,7 +1,7 @@ -package io.github.lsposed.lspd; +package org.lsposed.lspd; -import io.github.lsposed.lspd.utils.ParceledListSlice; -import io.github.lsposed.lspd.Application; +import org.lsposed.lspd.utils.ParceledListSlice; +import org.lsposed.lspd.Application; interface ILSPManagerService { diff --git a/manager-service/src/main/aidl/org/lsposed/lspd/utils/ParceledListSlice.aidl b/manager-service/src/main/aidl/org/lsposed/lspd/utils/ParceledListSlice.aidl new file mode 100644 index 00000000..7b4f99cc --- /dev/null +++ b/manager-service/src/main/aidl/org/lsposed/lspd/utils/ParceledListSlice.aidl @@ -0,0 +1,3 @@ +package org.lsposed.lspd.utils; + +parcelable ParceledListSlice; diff --git a/manager-service/src/main/java/io/github/lsposed/lspd/utils/BaseParceledListSlice.java b/manager-service/src/main/java/org/lsposed/lspd/utils/BaseParceledListSlice.java similarity index 98% rename from manager-service/src/main/java/io/github/lsposed/lspd/utils/BaseParceledListSlice.java rename to manager-service/src/main/java/org/lsposed/lspd/utils/BaseParceledListSlice.java index ccfd10f3..264bc4ba 100644 --- a/manager-service/src/main/java/io/github/lsposed/lspd/utils/BaseParceledListSlice.java +++ b/manager-service/src/main/java/org/lsposed/lspd/utils/BaseParceledListSlice.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.lsposed.lspd.utils; +package org.lsposed.lspd.utils; import android.os.Binder; import android.os.IBinder; @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import io.github.lsposed.lspd.managerservice.BuildConfig; +import org.lsposed.lspd.managerservice.BuildConfig; /** * Transfer a large list of Parcelable objects across an IPC. Splits into diff --git a/manager-service/src/main/java/io/github/lsposed/lspd/utils/ParceledListSlice.java b/manager-service/src/main/java/org/lsposed/lspd/utils/ParceledListSlice.java similarity index 99% rename from manager-service/src/main/java/io/github/lsposed/lspd/utils/ParceledListSlice.java rename to manager-service/src/main/java/org/lsposed/lspd/utils/ParceledListSlice.java index 50e36e69..d7581588 100644 --- a/manager-service/src/main/java/io/github/lsposed/lspd/utils/ParceledListSlice.java +++ b/manager-service/src/main/java/org/lsposed/lspd/utils/ParceledListSlice.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.github.lsposed.lspd.utils; +package org.lsposed.lspd.utils; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo;