Skip to content

add debug #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add debug #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ jobs:
- name: Build Debug Test APK (for Firebase Test Lab)
run: ./gradlew assembleDebugAndroidTest

- name: Setup build tool version variable
shell: bash
run: |
BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
echo Last build tool version is: $BUILD_TOOL_VERSION

################################################################################################
# Run Firebase Test Lab #
# See : https://medium.com/firebase-developers/github-actions-firebase-test-lab-4bc830685a99 #
Expand Down Expand Up @@ -72,6 +79,20 @@ jobs:
gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=cactus,version=27,locale=en,orientation=portrait


- name: Sign app APK
uses: r0adkll/sign-android-release@v1
# ID used to access action output
id: sign_app
with:
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.SIGN_APK_SIGNING_KEY }}
alias: ${{ secrets.SIGN_APK_ALIAS }}
keyStorePassword: ${{ secrets.SIGN_APP_STOREPASS }}
keyPassword: ${{ secrets.SIGN_APP_KEYPASS }}
env:
# override default build-tools version (29.0.3) -- optional
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}

##########################################
# Upload Artifacts (APK / AAR / JAR) #
##########################################
Expand All @@ -83,4 +104,18 @@ jobs:
name: Java-Debug-APK
path: ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk

#####################
# Prepare release #
#####################
- name: "Rename Release APK"
run: mv ${{ env.module_app }}/build/outputs/apk/release/app-release-unsigned-signed.apk ${{ env.module_app }}/build/outputs/apk/release/${{ env.module_app }}-release.apk

# Upload APK for Java version
- name: Upload APK Release for Java
if: always()
uses: actions/upload-artifact@v4
with:
name: Java-Release-APK
path: ${{ env.module_app }}/build/outputs/apk/release/${{ env.module_app }}-release.apk


5 changes: 5 additions & 0 deletions app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,11 @@ private void resolveRestrictions() {
JSONObject jsonServerConfig = new JSONObject();
LocalPreferences preferences = new LocalPreferences(context);

for (String key : serverConfig.keySet()) {
Object value = serverConfig.get(key);
AgentLog.d("Bundle EMM key: " + key + ", value: " + value);
}

if (serverConfig.getString("server_url").isEmpty()) {
enterpriseFeedback(getApplicationContext(), "server_url", "Error server URL is mandatory -> ", serverConfig.getString("server_url"), KeyedAppState.SEVERITY_ERROR);
AgentLog.e("EMM - server url is mandatory");
Expand Down
Loading