diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 90098dc68..d364b6a57 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -6,7 +6,7 @@ env: on: pull_request: branches: - - "develop" + - "main" jobs: build: diff --git a/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java b/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java index e416a8067..badfab019 100644 --- a/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java +++ b/app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java @@ -207,16 +207,6 @@ protected void onCreate(Bundle savedInstanceState) { checkPermissions(); setContentView(R.layout.activity_main); - if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA}, 1); - } - - ActivityCompat.requestPermissions(ActivityMain.this, - new String[]{ - Manifest.permission.READ_PHONE_STATE, - Manifest.permission.CAMERA, - }, - 1); if (!new LocalStorage(this).getDataBoolean("isFirstTime")) { loadCategories();