From cd4e2358495459ce030d54b6e0325ae324f2527c Mon Sep 17 00:00:00 2001
From: FriendlyNeighborhoodShane <shane.880088.supw@gmail.com>
Date: Wed, 11 Jan 2023 09:54:03 +0530
Subject: [PATCH] npem: factor out get_uid

---
 Full/system/bin/nanodroid-perm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Full/system/bin/nanodroid-perm b/Full/system/bin/nanodroid-perm
index 19be7065..93bb927f 100755
--- a/Full/system/bin/nanodroid-perm
+++ b/Full/system/bin/nanodroid-perm
@@ -25,9 +25,6 @@ nlpDejavu="org.fitchfamily.android.dejavu"
 nlpApple="org.microg.nlp.backend.apple"
 nlpBmap="org.openbmap.unifiedNlp"
 
-# GmsCore userId
-gms_uid=$(dumpsys package com.google.android.gms | awk -F= '/userId/{print $2; exit}')
-
 error () {
 	echo "!! ${@}"
 	exit 1
@@ -64,6 +61,10 @@ permissions () {
 	fi
 }
 
+get_uid () {
+	dumpsys package ${1} | awk -F= '/userId/{print $2; exit}'
+}
+
 get_app_location () {
 	pm list packages -f ${1} | sed 's|package:\(.*\)=[^=]*|\1|g'
 }
@@ -87,6 +88,8 @@ user_install () {
 
 [[ $(whoami) = "root" ]] || [[ $(whoami) = "shell" ]] || error "not running as either ADB or root"
 
+gms_uid=$(get_uid ${microG})
+
 if [ "$(getprop ro.build.version.sdk)" -ge 29 ]; then
 	# microG GmsCore needs to be installed as user app for all permissions to be granted
 	# see https://github.com/microg/android_packages_apps_GmsCore/issues/1100#issuecomment-711088518