Merge branch 'main' into dependabot/pip/werkzeug-2.3.8

config.py

@@ -75,12 +75,12 @@ def set_test_mode(test):
 STATIC_DATA = THIS_DIR / 'static_data'
 
 # TODO: We should get rid of this, ADB_PATH is very confusing
-ANDROID_HOME = os.getenv('ANDROID_HOME', STATIC_DATA)
+ANDROID_HOME = os.getenv('ANDROID_HOME', '')
 PLATFORM = ('darwin' if platform == 'darwin'
             else 'linux' if platform.startswith('linux')
             else 'win32' if platform == 'win32' else None)
 
-ADB_PATH = shlex.quote(os.path.join(ANDROID_HOME, 'adb-', PLATFORM))
+ADB_PATH = shlex.quote(os.path.join(ANDROID_HOME, 'adb'))
 
 #LIBIMOBILEDEVICE_PATH = shlex.quote(str(STATIC_DATA / ("libimobiledevice-" + PLATFORM)))
 LIBIMOBILEDEVICE_PATH = ''

privacy_scan_android.py

@@ -36,7 +36,7 @@
 import random
 import config
 adb=config.ADB_PATH
-
+print(f">>>>>>>>>>>>>>> {adb} <<<<<<<<<<<<<<<<<<<<")
 
 def run_command(cmd, **kwargs):
     _cmd = cmd.format(
@@ -122,8 +122,8 @@ def take_screenshot(ser, fname=None):
     #     keycode(ser, 'power'); keycode(ser, 'menu') # Wakes the screen up
     if not fname:
         fname = "tmp_screencap.png"
-    # cmd = "{cli} shell screencap -p | perl -pe 's/\\x0D\\x0A/\\x0A/g' > '{fname}'"
-    cmd = "{cli} shell screencap -p > '{fname}'"
+    cmd = "{cli} shell screencap -p | perl -pe 's/\\x0D\\x0A/\\x0A/g' > '{fname}'"
+    # cmd = "{cli} shell screencap -p > '{fname}'"
     run_command(cmd, cli=thiscli(ser), fname=fname)
 
 

requirements.txt

@@ -4,16 +4,16 @@ banal==1.0.6
 click==8.1.3
 dataset==1.5.2
 decorator==5.1.1
-Flask==2.2.5
-Flask-Migrate==2.5.2
-Flask-SQLAlchemy==2.5.1
-Flask-WTF==0.14.2
-greenlet==2.0.1
+Flask>=2.2.5
+Flask-Migrate>=2.5.2
+Flask-SQLAlchemy>=2.5.1
+Flask-WTF>=0.14.2
+greenlet>=2.0.1
 importlib-metadata==5.1.0
 infinity==1.5
 intervals==0.9.2
 itsdangerous==2.1.2
-Jinja2==3.1.2
+Jinja2==3.1.3
 Mako==1.2.4
 MarkupSafe==2.1.1
 numpy==1.23.5
@@ -30,7 +30,7 @@ SQLAlchemy-Utils==0.38.3
 tomli==2.0.1
 validators==0.20.0
 Werkzeug==2.3.8
-WTForms==2.2.1
-WTForms-Alchemy==0.16.9
-WTForms-Components==0.10.4
+WTForms
+WTForms-Alchemy
+WTForms-Components
 zipp==3.11.0

static_data/app-flags.csv

@@ -2552,7 +2552,7 @@ kr.co.cr.app,playstore,dual-use,통화녹음
 com.meowsbox.btgps,playstore,dual-use,Bluetooth GPS Output
 com.tai.cloud,playstore,dual-use,Easy sync for cloud contacts
 com.aip.mapsstreetview.worldmap.earthmap,playstore,dual-use,"Live Street View, World Map, Maps Directions"
-epic.mychart.android,playstore,dual-use,MyChart
+epic.mychart.android,playstore,safe,MyChart
 xdk.himanshu.btlgps,playstore,dual-use,BTL GPS Tracking 2
 com.gpscoordinatesandlocation,playstore,dual-use,My GPS Coordinates
 com.eit.tns,playstore,dual-use,Kingstrack GPS Tracking System

web/__init__.py

@@ -3,7 +3,7 @@
 import logging
 import config
 from flask import Flask, g, session, request
-from flask_sqlalchemy import Model, SQLAlchemy
+from flask_sqlalchemy import model, SQLAlchemy
 from flask_migrate import Migrate
 
 app = Flask(__name__, static_folder='../webstatic',