NikGapps 3.31__tar.gz → 3.32__tar.gz

{nikgapps-3.31 → nikgapps-3.32}/NikGapps/build/NikGappsManager.py

@@ -303,6 +303,27 @@ class NikGappsManager:
                     "resources": Library.get_device_health_services_resources()
                 }
             ],
+            "com.google.android.apps.nbu.files": [
+                {
+                    "package_title": "GoogleFiles",
+                    "package_name": "com.nikgapps.overlay.files",
+                    "resources": Library.get_google_files_resources()
+                }
+            ],
+            "com.google.android.apps.wallpaper": [
+                {
+                    "package_title": "GoogleWallpaper",
+                    "package_name": "com.nikgapps.overlay.wallpaper",
+                    "resources": Library.get_google_wallpaper_resources()
+                }
+            ],
+            "com.google.android.apps.work.oobconfig": [
+                {
+                    "package_title": "DeviceSetup",
+                    "package_name": "com.nikgapps.overlay.partnersetup",
+                    "resources": Library.get_google_partner_setup_resources()
+                }
+            ],
         }
         return [Overlay(overlay["package_title"], overlay["package_name"], self.android_version, overlay["resources"])
                 for overlay
@@ -402,6 +423,8 @@ class NikGappsManager:
                         # pixel_launcher_packages.append("CinematicEffect")
                         pixel_launcher_packages.append("EmojiWallpaper")
                         pixel_launcher_packages.append("PixelWeather")
+                        if float(self.android_version) >= 15:
+                            pixel_launcher_packages.append("AICore")
         pixel_specifics = self.create_appset_list_from_packages(pixel_launcher_packages)
         stock_packages = [
             "PlayGames",

{nikgapps-3.31 → nikgapps-3.32}/NikGapps/helper/Assets.py

@@ -1,12 +1,9 @@
 from pathlib import Path
 from importlib import resources
 
-from nikassets.helper.Assets import Assets as A
+from niklibrary.helper.Assets import Assets as A
 from niklibrary.helper.F import F
-
-from niklibrary.helper.Statics import Statics
 import os.path
-import platform
 
 from niklibrary.json.Json import Json
 
@@ -24,30 +21,17 @@ class Assets:
                     assets_folder = str(folders)
                     break
     cwd = assets_folder + os.path.sep
-    system_name = platform.system()
+    system_name = A.system_name
     apksigner_path = A.get("apksigner.jar")
     apktool_path = A.get("apktool_2.10.0.jar")
     key_path = A.get("cert.pk8")
     cert_path = A.get("cert.x509.pem")
     private_key_pem = A.get("private_key.pem")
-    if system_name == "Windows":
-        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2.exe')
-        adb_path = os.path.join(A.assets_folder, 'bin', system_name, 'adb.exe')
-    elif system_name == "Linux":
-        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2')
-        adb_path = "adb"
-    elif system_name == "Darwin":
-        aapt_path = os.path.join(A.assets_folder, 'bin', system_name, 'aapt2')
-        if not F.file_exists(aapt_path):
-            aapt_path = Statics.find_latest_aapt()
-        adb_path = "adb"
-    else:
-        aapt_path = "adb"
-        adb_path = "aapt2"
+    aapt_path = A.aapt_path
+    adb_path = A.adb_path
     addon_path = cwd + "addon.sh"
     header_path = cwd + "header.sh"
     functions_path = cwd + "functions.sh"
-    gofile_path = cwd + "gofile.sh"
     busybox = A.get("busybox")
     file_sizes_path = cwd + "file_size.txt"
     mount_path = cwd + "mount.sh"

{nikgapps-3.31 → nikgapps-3.32}/NikGapps/helper/assets/appsets.json

@@ -406,6 +406,12 @@
         "EmojiWallpaper",
         "PixelWeather"
       ]
+    },
+    {
+      "min_version": 15,
+      "packages": [
+        "AICore"
+      ]
     }
   ],
   "PlayGames": [

{nikgapps-3.31 → nikgapps-3.32}/NikGapps/helper/assets/packages.json

@@ -614,5 +614,13 @@
             "title": "YouTubeMusicPrebuilt",
             "type": "app"
         }
+    ],
+    "AICore": [
+        {
+            "package_name": "com.google.android.aicore",
+            "partition": "product",
+            "title": "AiCorePrebuilt",
+            "type": "priv-app"
+        }
     ]
 }

{nikgapps-3.31 → nikgapps-3.32}/NikGapps/helper/overlay/Library.py

@@ -48,6 +48,8 @@ class Library:
         r.add(String('config_defaultDndAccessPackages', 'com.google.android.gms:com.google.android.apps.wellbeing',
                      comment='Colon separated list of package names that should be granted DND access.'))
         r.add(StringArray('config_packagesExemptFromSuspension', ['com.google.android.apps.wellbeing']))
+        r.add(StringArray('config_quickSettingsAutoAdd', ['wind_down_first_time_setup:custom(com.google.android.apps.wellbeing/.screen.ui.GrayscaleTileService)',
+                                                          'focus_mode_first_time_setup:custom(com.google.android.apps.wellbeing/.focusmode.quicksettings.FocusModeTileService)']))
         return r
 
     @staticmethod
@@ -82,6 +84,10 @@ class Library:
         r.add(String('platform_number_verification_package', 'com.google.android.gms'))
         r.add(String('config_defaultQrCodeComponent',
                      'com.google.android.gms/.mlkit.barcode.ui.PlatformBarcodeScanningActivityProxy'))
+        r.add(String('config_defaultCredentialManagerHybridService', 'com.google.android.gms/.auth.api.credentials.credman.service.RemoteService'))
+        r.add(String('config_remoteCopyPackage', 'com.google.android.gms/.nearby.sharing.RemoteCopyShareSheetActivity'))
+        r.add(String('config_systemCallStreaming', 'com.google.android.gms'))
+        r.add(String('config_oemCredentialManagerDialogComponent', 'com.google.android.gms/.identitycredentials.ui.CredentialChooserActivity'))
         r.add(Bool('config_enableAutoPowerModes', True))
         r.add(Bool('config_enableNetworkLocationOverlay', True))
         r.add(Bool('config_enableFusedLocationOverlay', True))
@@ -460,3 +466,25 @@ class Library:
         r.add(String('config_defaultWallpaperEffectsGenerationService',
                      'com.google.android.as/com.google.android.apps.miphone.aiai.app.wallpapereffects.AiAiWallpaperEffectsGenerationService'))
         return r
+
+    @staticmethod
+    def get_google_files_resources():
+        r = Resources()
+        r.add(String('config_systemFilePicker', 'com.google.android.apps.nbu.files'))
+        r.add(String('config_sceenshotWorkProfileFilesApp', 'com.google.android.apps.nbu.files/com.google.android.apps.nbu.files.home.HomeActivity'))
+        return r
+
+    @staticmethod
+    def get_google_wallpaper_resources():
+        r = Resources()
+        r.add(String('config_wallpaper_picker_package', 'com.google.android.apps.wallpaper'))
+        r.add(String('config_wallpaperCropperPackage', 'com.google.android.apps.wallpaper'))
+        r.add(String('config_wallpaper_picker_class', 'com.google.android.apps.wallpaper.picker.CategoryPickerActivity'))
+        r.add(String('config_styles_and_wallpaper_picker_class', 'com.android.customization.picker.CustomizationPickerActivity'))
+        return r
+
+    @staticmethod
+    def get_google_partner_setup_resources():
+        r = Resources()
+        r.add(String('config_deviceProvisioningPackage', 'com.google.android.apps.work.oobconfig'))
+        return r

{nikgapps-3.31 → nikgapps-3.32/NikGapps.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.31
+Version: 3.32
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.31 → nikgapps-3.32}/NikGapps.egg-info/SOURCES.txt

@@ -63,7 +63,4 @@ NikGapps/helper/overlay/Overlay.py
 NikGapps/helper/overlay/Resources.py
 NikGapps/helper/overlay/String.py
 NikGapps/helper/overlay/StringArray.py
-NikGapps/helper/overlay/__init__.py
-NikGapps/helper/upload/CmdUpload.py
-NikGapps/helper/upload/GoFileUpload.py
-NikGapps/helper/upload/__init__.py
+NikGapps/helper/overlay/__init__.py

{nikgapps-3.31/NikGapps.egg-info → nikgapps-3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NikGapps
-Version: 3.31
+Version: 3.32
 Summary: A short description of your project
 Home-page: https://github.com/nikgapps/project
 Author: Nikhil Menghani

{nikgapps-3.31 → nikgapps-3.32}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="NikGapps",
-version="3.31",
+version="3.32",
     packages=find_packages(),
     include_package_data=True,
     package_data={

nikgapps-3.31/NikGapps/helper/upload/CmdUpload.py

@@ -1,169 +0,0 @@
-import os
-import platform
-import time
-from pathlib import Path
-import pexpect
-from niklibrary.helper.F import F
-from niklibrary.helper.P import P
-from niklibrary.helper.Statics import Statics
-from niklibrary.helper.T import T
-from niklibrary.web.TelegramApi import TelegramApi
-
-
-class CmdUpload:
-
-    def __init__(self, android_version, release_type, upload_files, password=None):
-        self.android_version_code = Statics.get_android_code(android_version)
-        self.upload_files = upload_files
-        self.host = "frs.sourceforge.net"
-        self.username = "nikhilmenghani"
-        self.password = os.environ.get('SF_PWD') if password is None else password
-        self.release_dir = Statics.get_sourceforge_release_directory(release_type)
-        self.release_date = T.get_london_date_time("%d-%b-%Y")
-        self.child = None
-        self.successful_connection = False
-        if self.password is None or self.password.__eq__(""):
-            self.password = ""
-            self.sftp = None
-            P.red("Password is not set, please set the password in environment variable SF_PWD")
-            return
-        self.connect_using_pexpect()
-
-    def expect_password(self):
-        self.child.sendline(str(self.password))
-        print(f"Expecting Connected to {self.host} or sftp> or Password")
-        return self.check_successful_connection()
-
-    def check_successful_connection(self):
-        status = self.child.expect([f"Connected to {self.host}", "sftp> ", "Password"])
-        if status == 0 or status == 1:
-            print("Connection was successful")
-            return True
-        return False
-
-    def connect_using_pexpect(self):
-        self.child = pexpect.spawn(f'sftp {self.username}@{self.host}')
-        tried_twice = False
-        print("Expecting Password")
-        while True:
-            i = self.child.expect(["Password", "yes/no", pexpect.TIMEOUT, pexpect.EOF], timeout=120)
-            if i == 0:  # Password
-                print("Sending Password")
-                self.successful_connection = self.expect_password()
-            elif i == 1:  # yes/no
-                print("sending yes")
-                self.child.sendline("yes")
-                print("Expecting Password")
-                self.child.expect("Password")
-                self.successful_connection = self.expect_password()
-            elif i == 2 or i == 3:  # TIMEOUT or EOF
-                if not tried_twice:
-                    print("Timeout has occurred, let's try one more time")
-                    # self.child.sendcontrol('c')
-                    self.close_connection()
-                    self.child = pexpect.spawn('sftp nikhilmenghani@frs.sourceforge.net')
-                    tried_twice = True
-                else:
-                    print("Connection failed")
-                    break
-            else:  # other cases
-                print("Connection failed")
-                self.close_connection()
-                try:
-                    self.child.interact()
-                except BaseException as e:
-                    print("Exception while interacting: " + str(e))
-            if self.successful_connection or i not in [0, 1, 2, 3]:
-                break
-
-    def navigate_to_directory(self, directory):
-        self.child.expect('sftp>')
-        self.child.sendline(f'cd {directory}')
-
-    def create_directory_structure(self, remote_directory):
-        # Split the directory path into components
-        remote_directory = remote_directory.replace(f"{self.release_dir}/", '')
-        directories = remote_directory.split('/')
-        # cd to the root directory
-        self.navigate_to_directory(self.release_dir)
-        # Create each directory in the path separately
-        for i in range(len(directories)):
-            path = '/'.join(directories[:i + 1])
-            print(f"Creating directory {self.release_dir}/{path}")
-            self.child.expect('sftp>')
-            self.child.sendline(f'mkdir {path}')
-
-    def get_cd(self, file_type):
-        folder_name = "Test"
-        match file_type:
-            case "gapps":
-                folder_name = "NikGapps-" + self.android_version_code
-            case "config":
-                folder_name = "NikGapps-" + self.android_version_code
-                return self.release_dir + "/" + folder_name
-            case "addons":
-                folder_name = "Addons-" + self.android_version_code
-            case "debloater":
-                folder_name = "Debloater"
-            case _:
-                print(file_type)
-        print("Upload Dir: " + self.release_dir + "/" + folder_name)
-        return self.release_dir + "/" + folder_name + "/" + self.release_date
-
-    def upload_file(self, file_path, remote_path):
-        self.child.sendline("put " + file_path + " " + remote_path)
-        self.child.expect("Uploading")
-        self.child.expect("100%", timeout=3600)
-        self.child.expect("sftp>")
-        time.sleep(1)
-
-    def upload(self, file_name, telegram: TelegramApi = None, remote_directory=None):
-        execution_status = False
-        download_link = None
-        file_size_mb = None
-        if self.successful_connection:
-            system_name = platform.system()
-            file_size_kb = round(F.get_file_size(file_name, "KB"), 2)
-            file_size_mb = round(F.get_file_size(file_name), 2)
-            if telegram is not None:
-                telegram.message(f"- The zip {file_size_mb} MB is uploading...")
-            if system_name != "Windows" and self.upload_files:
-                t = T()
-                file_type = "gapps"
-                if os.path.basename(file_name).__contains__("-Addon-"):
-                    file_type = "addons"
-                elif os.path.basename(file_name).__contains__("Debloater"):
-                    file_type = "debloater"
-
-                if remote_directory is None:
-                    remote_directory = self.get_cd(file_type)
-
-                remote_filename = Path(file_name).name
-                self.create_directory_structure(remote_directory)
-                self.navigate_to_directory(remote_directory)
-                self.upload_file(file_name, remote_filename)
-                P.green(f'File uploaded successfully to {remote_directory}/{remote_filename}')
-                download_link = Statics.get_download_link(file_name, remote_directory)
-                P.magenta("Download Link: " + download_link)
-                print("uploading file finished...")
-                execution_status = True
-                time_taken = t.taken(f"Total time taken to upload file with size {file_size_mb} MB ("
-                                     f"{file_size_kb} Kb)")
-                if execution_status:
-                    if telegram is not None:
-                        telegram.message(
-                            f"- The zip {file_size_mb} MB uploaded in {T.format_time(round(time_taken))}\n",
-                            replace_last_message=True)
-                        if download_link is not None:
-                            telegram.message(f"*Note:* Download link should start working in 10 minutes", escape_text=False,
-                                             ur_link={f"Download": f"{download_link}"})
-            else:
-                P.red("System incompatible or upload disabled or connection failed!")
-        else:
-            P.red("Connection failed!")
-        return execution_status, download_link, file_size_mb
-
-    def close_connection(self):
-        if not str(self.password).__eq__(""):
-            self.child.sendline("bye")
-            self.child.close()

nikgapps-3.31/NikGapps/helper/upload/GoFileUpload.py

@@ -1,56 +0,0 @@
-import platform
-
-from NikGapps.helper.Assets import Assets
-from niklibrary.helper.Cmd import Cmd
-from niklibrary.helper.F import F
-from niklibrary.helper.P import P
-from niklibrary.helper.T import T
-from niklibrary.web.TelegramApi import TelegramApi
-
-
-class GoFileUpload:
-
-    @staticmethod
-    def upload_file(file):
-        cmd = Cmd()
-        command = [f"{Assets.gofile_path}"] + [file]
-        output = cmd.execute_cmd(command)
-        print("Upload Log: " + str(output))
-        for line in output:
-            if line.startswith("https://gofile.io/"):
-                return line
-        return None
-
-    @staticmethod
-    def upload(file_name, telegram: TelegramApi = None):
-        system_name = platform.system()
-        execution_status = False
-        download_link = None
-        file_size_mb = None
-        if telegram is not None:
-            telegram.message("- The zip is uploading...")
-        if system_name != "Windows":
-            t = T()
-            download_link = GoFileUpload.upload_file(file_name)
-            P.magenta("Download Link: " + download_link)
-            if download_link is None:
-                P.red("Upload failed!")
-                telegram.message("- Upload failed!")
-                return execution_status
-            print("uploading file finished...")
-            execution_status = True
-            file_size_kb = round(F.get_file_size(file_name, "KB"), 2)
-            file_size_mb = round(F.get_file_size(file_name), 2)
-            time_taken = t.taken(f"Total time taken to upload file with size {file_size_mb} MB ("
-                                 f"{file_size_kb} Kb)")
-            if execution_status:
-                if telegram is not None:
-                    telegram.message(
-                        f"- The zip {file_size_mb} MB uploaded in {str(round(time_taken))} seconds\n",
-                        replace_last_message=True)
-                    if download_link is not None:
-                        telegram.message(f"*Note:* Download link should start working in 10 minutes", escape_text=False,
-                                         ur_link={f"Download": f"{download_link}"})
-        else:
-            P.red("System incompatible or upload disabled or connection failed!")
-        return execution_status, download_link, file_size_mb