From f0ac4238ffe0258bd62ab30e85ff2d333f955f61 Mon Sep 17 00:00:00 2001
From: Li <li@silica.codes>
Date: Mon, 6 Nov 2023 13:25:23 +1300
Subject: [PATCH] add psm uid

---
 .gitignore                                    |  1 +
 .idea/.name                                   |  1 -
 .idea/gradle.xml                              |  2 ++
 .idea/misc.xml                                | 18 +++++++--------
 .../pink/yuv/android_id/MainActivity.java     | 23 +++++++++++++++----
 app/src/main/res/layout/activity_main.xml     | 20 +++++++++++++---
 6 files changed, 47 insertions(+), 18 deletions(-)
 delete mode 100644 .idea/.name

diff --git a/.gitignore b/.gitignore
index aa724b7..be90fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /.idea/assetWizardSettings.xml
 .DS_Store
 /build
+/app/build/*
 /captures
 .externalNativeBuild
 .cxx
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index b3405b3..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-My Application
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 948997e..02a60b0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e3f4bf0..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
 </project>
\ 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 ae680dc..c8c8e3c 100644
--- a/app/src/main/java/pink/yuv/android_id/MainActivity.java
+++ b/app/src/main/java/pink/yuv/android_id/MainActivity.java
@@ -1,11 +1,11 @@
 package pink.yuv.android_id;
 
 import android.app.Activity;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.provider.Settings;
+import android.provider.Settings.Secure;
 import android.widget.TextView;
-
 import org.jetbrains.annotations.Nullable;
 
 public class MainActivity extends Activity {
@@ -14,9 +14,22 @@ public class MainActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        TextView androidIdTextView = (TextView)findViewById(R.id.textView);
-        String android_id = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        TextView androidIdTextView = (TextView)findViewById(R.id.androidId);
+        String android_id = Secure.getString(getContentResolver(), Secure.ANDROID_ID);
         System.out.println("android_id: "+android_id);
         androidIdTextView.setText("android_id: "+android_id);
+
+        String psmAppId = "app not installed";
+
+        try{
+            ApplicationInfo psmAppInfo = this.getApplicationContext().getPackageManager().getApplicationInfo("com.playstation.psstore", 0);
+            if(psmAppInfo != null)
+                psmAppId = String.valueOf(psmAppInfo.uid);
+        }
+        catch (PackageManager.NameNotFoundException e) { };
+
+        TextView psmAppIdTextView = (TextView)findViewById(R.id.psmAppId);
+        System.out.println("psstore_uid: "+psmAppId);
+        psmAppIdTextView.setText("psstore_uid: "+psmAppId);
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b1548ae..c1cbfdb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,12 +1,26 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+	android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+	android:orientation="vertical">
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/androidId"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="@color/white"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+		android:text="android_id: "/>
+
+    <TextView
+        android:id="@+id/psmAppId"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/androidId"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+		android:text="psstore_uid: "/>
+
 </RelativeLayout>
\ No newline at end of file