Update app.py

app.py

@@ -3,33 +3,17 @@ import os
 import zipfile
 import subprocess
 import shutil
-import glob
 
 # Page Config
 st.set_page_config(page_title="Android Build Server", layout="centered")
 
-st.title("📱 Android APK Generator (Auto-Signed)")
-st.markdown("Zip upload karein. Server APK banayega aur **Sign** karke dega taake install ho sakay.")
+st.title("📱 Android APK Generator (Final Production)")
+st.markdown("Zip upload karein. Server APK banayega aur **Auto-Sign** karega.")
 
-# --- HELPER FUNCTION: FIND TOOLS ---
-def find_tool(tool_name):
-    # System path mein dhoondo
-    tool_path = shutil.which(tool_name)
-    if tool_path:
-        return tool_path
-    
-    # Agar nahi mila, to Android SDK folder mein dhoondo
-    sdk_root = os.environ.get("ANDROID_HOME", "/opt/android-sdk")
-    found_files = glob.glob(f"{sdk_root}/build-tools/*/{tool_name}")
-    if found_files:
-        return found_files[-1] # Latest version utha lo
-    return None
-
-# --- HELPER FUNCTION: GENERATE KEYSTORE ---
+# --- HELPER: GENERATE KEY ---
 def generate_keystore():
     keystore_path = "debug.keystore"
     if not os.path.exists(keystore_path):
-        # Keytool command to create a generic key
         cmd = [
             "keytool", "-genkey", "-v", 
             "-keystore", keystore_path, 
@@ -44,7 +28,6 @@ def generate_keystore():
         subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     return keystore_path
 
-# --- MAIN UI ---
 uploaded_file = st.file_uploader("Project ZIP File Upload Karein", type=["zip"])
 
 if uploaded_file is not None:
@@ -80,11 +63,9 @@ if uploaded_file is not None:
             gradlew_path = os.path.join(project_root, "gradlew")
             subprocess.run(["chmod", "+x", gradlew_path])
             
-            # 5. Build (Use assembleRelease for production feel)
-            # Hum 'assembleRelease' use karenge, jo unsigned APK dega, phir hum usay sign karenge
+            # 5. Build
             status_text.info("Building APK... (Wait karein)")
-            
-            # Note: Hum 'clean' nahi kar rahay taake jaldi ho, agar error aye to clean add kar lena
+            # Hum assembleRelease chala rahe hain
             build_cmd = ["./gradlew", "assembleRelease", "--no-daemon", "--stacktrace"]
             
             try:
@@ -99,7 +80,7 @@ if uploaded_file is not None:
                 progress_bar.progress(60)
                 
                 if result.returncode == 0:
-                    status_text.info("✅ Build Successful! Ab Signing kar rahay hain...")
+                    status_text.info("✅ Build Successful! Signing APK...")
                     
                     # 6. Find Unsigned APK
                     unsigned_apk = None
@@ -110,51 +91,47 @@ if uploaded_file is not None:
                                 break
                     
                     if unsigned_apk:
-                        # 7. SIGNING PROCESS ✍️
+                        # 7. SIGNING (Direct System Commands)
                         keystore = generate_keystore()
-                        apksigner = find_tool("apksigner")
-                        
-                        if apksigner:
-                            signed_apk_name = "production_ready_app.apk"
-                            
-                            # Align APK (Optimization)
-                            zipalign = find_tool("zipalign")
-                            aligned_apk = "aligned.apk"
-                            if zipalign:
-                                subprocess.run([zipalign, "-v", "-p", "4", unsigned_apk, aligned_apk], stdout=subprocess.DEVNULL)
-                                apk_to_sign = aligned_apk
-                            else:
-                                apk_to_sign = unsigned_apk
+                        signed_apk_name = "Installable_App.apk"
+                        aligned_apk = "aligned.apk"
 
-                            # Sign APK
-                            sign_cmd = [
-                                apksigner, "sign",
-                                "--ks", keystore,
-                                "--ks-pass", "pass:android",
-                                "--out", signed_apk_name,
-                                apk_to_sign
-                            ]
-                            
-                            sign_result = subprocess.run(sign_cmd, capture_output=True, text=True)
+                        # Step A: ZipAlign (Important for installation)
+                        try:
+                            subprocess.run(["zipalign", "-v", "-p", "4", unsigned_apk, aligned_apk], 
+                                           stdout=subprocess.DEVNULL, check=True)
+                            apk_to_sign = aligned_apk
+                        except:
+                            # Agar align fail ho, to original use kar lo
+                            apk_to_sign = unsigned_apk
+
+                        # Step B: APKSigner
+                        sign_cmd = [
+                            "apksigner", "sign",
+                            "--ks", keystore,
+                            "--ks-pass", "pass:android",
+                            "--out", signed_apk_name,
+                            apk_to_sign
+                        ]
+                        
+                        sign_result = subprocess.run(sign_cmd, capture_output=True, text=True)
+                        
+                        if sign_result.returncode == 0:
+                            status_text.success("🎉 APK Signed & Ready to Install!")
+                            progress_bar.progress(100)
                             
-                            if sign_result.returncode == 0:
-                                status_text.success("🎉 APK Signed & Ready!")
-                                progress_bar.progress(100)
-                                
-                                with open(signed_apk_name, "rb") as f:
-                                    st.download_button(
-                                        label="⬇️ Download Signed APK",
-                                        data=f,
-                                        file_name=signed_apk_name,
-                                        mime="application/vnd.android.package-archive"
-                                    )
-                            else:
-                                st.error("Build pass hui, magar Signing fail hogayi.")
-                                st.text_area("Signing Error", sign_result.stderr)
+                            with open(signed_apk_name, "rb") as f:
+                                st.download_button(
+                                    label="⬇️ Download Installable APK",
+                                    data=f,
+                                    file_name=signed_apk_name,
+                                    mime="application/vnd.android.package-archive"
+                                )
                         else:
-                            st.error("Server par 'apksigner' tool nahi mila.")
+                            st.error("Build hui magar Signing fail hogayi.")
+                            st.text_area("Signing Log", sign_result.stderr)
                     else:
-                        st.error("Build ho gayi magar APK file dhoondne mein masla hua.")
+                        st.error("APK file generate nahi hui.")
                         
                 else:
                     st.error("❌ Build Failed!")