diff --git a/.Jules/palette.md b/.Jules/palette.md new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/com/bytedance/shadowhook/sample/MainActivity.java b/app/src/main/java/com/bytedance/shadowhook/sample/MainActivity.java index 90c3219..5f09fe9 100644 --- a/app/src/main/java/com/bytedance/shadowhook/sample/MainActivity.java +++ b/app/src/main/java/com/bytedance/shadowhook/sample/MainActivity.java @@ -25,10 +25,15 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; +import android.widget.TextView; +import android.widget.Toast; import com.bytedance.shadowhook.ShadowHook; import com.bytedance.shadowhook.systest.SysTest; @@ -48,6 +53,16 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); } + public void onLogcatCommandClick(View view) { + if (view instanceof TextView) { + String text = ((TextView) view).getText().toString(); + ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText("logcat command", text); + clipboard.setPrimaryClip(clip); + Toast.makeText(this, R.string.copy_to_clipboard, Toast.LENGTH_SHORT).show(); + } + } + public void onUnitTestHookSymAddrClick(View view) { NativeHandler.nativeHookSymAddr(Build.VERSION.SDK_INT); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c74fc8e..685883a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,7 +16,11 @@ android:orientation="vertical"> + android:id="@+id/logcatCommand" + android:text="@string/logcat_command" + android:clickable="true" + android:focusable="true" + android:onClick="onLogcatCommandClick" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3b1ca3..2b610dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ shadowhook - \ No newline at end of file + adb logcat -b main -s shadowhook_tag + Copied to clipboard + diff --git a/build.gradle b/build.gradle index 606ebdd..ede760a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.2.2' apply false + id 'com.android.library' version '8.2.2' apply false } task clean(type: Delete) { @@ -12,7 +12,7 @@ ext { compileSdkVersion = 34 targetSdkVersion = 34 buildToolsVersion = '34.0.0' - javaVersion = JavaVersion.VERSION_1_7 + javaVersion = JavaVersion.VERSION_1_8 ndkVersion = "23.2.8568313" cmakeVersion = "3.22.1" abiFilters = "armeabi-v7a,arm64-v8a" diff --git a/gradle.properties b/gradle.properties index f06ddf7..30cef6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,3 @@ android.useAndroidX=true # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true #android.prefabVersion=2.0.0 -android.disableAutomaticComponentCreation=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 927b535..2fdb227 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Dec 30 21:41:31 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME