diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 02a60b0..0b0534c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,15 @@ diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/build.gradle b/app/build.gradle index 982b67b..cdf1158 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ plugins { android { namespace 'pink.yuv.android_id' - compileSdk 33 + compileSdk 10 defaultConfig { applicationId "pink.yuv.android_id" @@ -13,8 +13,6 @@ android { targetSdk 10 versionCode 1 versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -30,7 +28,5 @@ android { } dependencies { - implementation 'org.jetbrains:annotations:15.0' - implementation 'androidx.annotation:annotation-jvm:+' - testImplementation 'junit:junit:4.13.2' + } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20202fd..7088138 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,16 +1,13 @@ - + + + tools:targetApi="20"> @@ -18,5 +15,4 @@ - \ No newline at end of file diff --git a/app/src/main/java/pink/yuv/android_id/MainActivity.java b/app/src/main/java/pink/yuv/android_id/MainActivity.java index c8c8e3c..95eeb30 100644 --- a/app/src/main/java/pink/yuv/android_id/MainActivity.java +++ b/app/src/main/java/pink/yuv/android_id/MainActivity.java @@ -1,16 +1,19 @@ package pink.yuv.android_id; import android.app.Activity; +import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; import android.provider.Settings.Secure; +import android.telephony.TelephonyManager; import android.widget.TextView; -import org.jetbrains.annotations.Nullable; + public class MainActivity extends Activity { @Override - public void onCreate(@Nullable Bundle savedInstanceState) { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -31,5 +34,72 @@ public class MainActivity extends Activity { TextView psmAppIdTextView = (TextView)findViewById(R.id.psmAppId); System.out.println("psstore_uid: "+psmAppId); psmAppIdTextView.setText("psstore_uid: "+psmAppId); + + Context appCtx = getApplicationContext(); + TelephonyManager tm = ((TelephonyManager) appCtx.getSystemService( Context.TELEPHONY_SERVICE)); + String deviceId = tm.getDeviceId(); + if(deviceId == null) + deviceId = "(blank)"; + + String serial = Build.SERIAL; + if(serial == null) + serial = "(blank)"; + + String brand = Build.BRAND; + if(brand == null) + brand = "(blank)"; + + String manu = Build.MANUFACTURER; + if(manu == null) + manu = "(blank)"; + + String model = Build.MODEL; + if(model == null) + model = "(blank)"; + + String product = Build.PRODUCT; + if(product == null) + product = "(blank)"; + + String device = Build.DEVICE; + if(device == null) + device = "(blank)"; + + String type = Build.TYPE; + if(type == null) + type = "(blank)"; + + + TextView devPhoneIdTextview = (TextView)findViewById(R.id.devPhoneId); + System.out.println("getDeviceId(): " + deviceId); + devPhoneIdTextview.setText("getDeviceId(): "+deviceId); + + TextView devSerialTextview = (TextView)findViewById(R.id.devSerial); + System.out.println("SERIAL: " + serial); + devSerialTextview.setText("SERIAL: "+serial); + + TextView devBrandTextview = (TextView)findViewById(R.id.devBrand); + System.out.println("BRAND: " + brand); + devBrandTextview.setText("BRAND: "+brand); + + TextView devManuTextview = (TextView)findViewById(R.id.devManu); + System.out.println("MANUFACTURER: " + manu); + devManuTextview.setText("MANUFACTURER: "+manu); + + TextView devModelTextview = (TextView)findViewById(R.id.devModel); + System.out.println("MODEL: " + model); + devModelTextview.setText("MODEL: "+model); + + TextView devProductTextview = (TextView)findViewById(R.id.devProduct); + System.out.println("PRODUCT: " + product); + devProductTextview.setText("PRODUCT: "+product); + + TextView devDeviceTextview = (TextView)findViewById(R.id.devDevice); + System.out.println("DEVICE: " + device); + devDeviceTextview.setText("DEVICE: "+device); + + TextView devTyoeTextview = (TextView)findViewById(R.id.devType); + System.out.println("TYPE: " + type); + devTyoeTextview.setText("TYPE: "+type); } } diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/app_icon.png b/app/src/main/res/drawable/app_icon.png new file mode 100644 index 0000000..8cfe174 Binary files /dev/null and b/app/src/main/res/drawable/app_icon.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c1cbfdb..00210e6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,11 +5,19 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:orientation="vertical"> + @@ -23,4 +31,84 @@ android:textSize="20sp" android:text="psstore_uid: "/> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml deleted file mode 100644 index fa0f996..0000000 --- a/app/src/main/res/xml/backup_rules.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml deleted file mode 100644 index 9ee9997..0000000 --- a/app/src/main/res/xml/data_extraction_rules.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file