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

Jump to bottom

App Config With Restriction Manager #12884

Merged

tobiasKaminsky merged 22 commits into master from feature/app-config

May 10, 2024

Collaborator

alperozturk96 commented Apr 16, 2024 •

edited

Loading

Tests written, or not not needed

Feature

Enterprise client can set proxy config

Listening app config changes reactively

Add new is_branded_plus option

What to Test

Drawer top bar visibility, assistant feature visibility due newly added is_branded_plus option

alperozturk96 added the 2. developing label

alperozturk96 requested a review from tobiasKaminsky

April 16, 2024 07:57

alperozturk96 force-pushed the feature/app-config branch from 6ac16b1 to 38e6cb2 Compare

April 16, 2024 07:57

alperozturk96 commented

View reviewed changes

app/src/main/res/xml/app_config.xml Outdated Show resolved Hide resolved

alperozturk96 commented

View reviewed changes

app/src/main/java/com/owncloud/android/utils/enterpriseReporter/EnterpriseReporter.kt Outdated Show resolved Hide resolved

alperozturk96 commented

View reviewed changes

app/src/main/res/xml/app_config.xml Show resolved Hide resolved

alperozturk96 commented

View reviewed changes

app/src/main/java/com/owncloud/android/utils/appConfig/AppConfigManager.kt Outdated Show resolved Hide resolved

alperozturk96 commented

View reviewed changes

app/src/main/res/xml/app_config.xml Show resolved Hide resolved

alperozturk96 force-pushed the feature/app-config branch 3 times, most recently from 8c10a68 to 6e74bf8 Compare

April 18, 2024 15:27

alperozturk96 added 3. to review and removed 2. developing labels

alperozturk96 force-pushed the feature/app-config branch 2 times, most recently from 0247ab6 to 04a451a Compare

April 26, 2024 14:06

alperozturk96 force-pushed the feature/app-config branch 2 times, most recently from bbb818b to fe0c0d4 Compare

May 2, 2024 06:57

tobiasKaminsky reviewed

View reviewed changes

app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java Show resolved Hide resolved

tobiasKaminsky reviewed

View reviewed changes

app/src/main/java/com/owncloud/android/MainApp.java Outdated Show resolved Hide resolved

alperozturk96 force-pushed the feature/app-config branch 2 times, most recently from bf70ccd to 5927623 Compare

May 3, 2024 12:37

alperozturk96 requested a review from tobiasKaminsky

May 3, 2024 12:58

tobiasKaminsky approved these changes

View reviewed changes

Member

tobiasKaminsky commented May 6, 2024

Can you check failing tests?

at com.owncloud.android.AbstractIT.beforeAll(AbstractIT.java:128)
34) com.owncloud.android.utils.FileUtilTest
java.lang.IllegalArgumentException: port out of range:441212

It seems that a port is being used?

alperozturk96 force-pushed the feature/app-config branch from 5202593 to a83bcb2 Compare

May 6, 2024 11:38

alperozturk96 commented

View reviewed changes

app/src/main/java/com/owncloud/android/utils/appConfig/AppConfigManager.kt Show resolved Hide resolved

alperozturk96 added 2. developing and removed 3. to review labels

alperozturk96 added 2 commits

May 6, 2024 15:31


          Use restriction manager for app config

8a48da3

Signed-off-by: alperozturk <[email protected]>


          Use androidx.enterprise:enterprise-feedback for give feedback to cust…

7b46e6d

…omer

Signed-off-by: alperozturk <[email protected]>

alperozturk96 and others added 18 commits

May 6, 2024 15:31


          Simplify AppConfigManager

22e9a40

Signed-off-by: alperozturk <[email protected]>


          Simplify AppConfigManager

ac1c41b

Signed-off-by: alperozturk <[email protected]>


          Revert lenient option

cab8405

Signed-off-by: alperozturk <[email protected]>


          Add base url config, is_branded_plus, remove enterprise reporter

b727fc3

Signed-off-by: alperozturk <[email protected]>


          Add AppConfigManagerTests

d429a76

Signed-off-by: alperozturk <[email protected]>


          Only branded plus client can use app config

325dc86

Signed-off-by: alperozturk <[email protected]>


          Add is client branded functions

2d8840b

Signed-off-by: alperozturk <[email protected]>


          Add is_branded_plus condition for is_branded if statements

05ec75b

Signed-off-by: alperozturk <[email protected]>


          Revert isBrandedClient checks

b7defed

Signed-off-by: alperozturk <[email protected]>


          Revert filterAssistantMenuItem usage

ad3ec21

Signed-off-by: alperozturk <[email protected]>


          Fix code analytics

cf61ce2

Signed-off-by: alperozturk <[email protected]>


          Add base url to app_config.xml

9a0f69e

Signed-off-by: alperozturk <[email protected]>


          Revert drawer activity header

d54c86e

Signed-off-by: alperozturk <[email protected]>


          abort setting proxy when either host or port is not valid

ba4a61c

Signed-off-by: tobiasKaminsky <[email protected]>


          init RestrictionsManager only for branded plus clients

b55962e

Signed-off-by: alperozturk <[email protected]>


          Listen app config changes only for branded plus clients

c9b277e

Signed-off-by: alperozturk <[email protected]>


          Fix tests

8ed89d7

Signed-off-by: alperozturk <[email protected]>


          Dont set default proxy settings

ce0bb85

Signed-off-by: alperozturk <[email protected]>

alperozturk96 force-pushed the feature/app-config branch from 6829dcc to ce0bb85 Compare

May 6, 2024 13:31


          Fix code analytics

51709a0

Signed-off-by: alperozturk <[email protected]>

alperozturk96 added 3. to review and removed 2. developing labels

alperozturk96 enabled auto-merge

May 6, 2024 18:34


          reset proxy

1565b32

Signed-off-by: tobiasKaminsky <[email protected]>

github-actions bot commented May 10, 2024

Codacy

Lint

Type	master	PR
Warnings	72	72
Errors	3	3

SpotBugs

Category	Base	New
Bad practice	66	66
Correctness	70	70
Dodgy code	349	349
Experimental	1	1
Internationalization	7	7
Malicious code vulnerability	2	2
Multithreaded correctness	6	6
Performance	57	57
Security	19	19
Total	577	577

github-actions bot commented May 10, 2024

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12884.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

github-actions bot commented May 10, 2024

blue-Light-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/12884-Screenshot-blue-Light-07-15

tobiasKaminsky disabled auto-merge

May 10, 2024 13:11

tobiasKaminsky merged commit 176a096 into master

20 of 21 checks passed

delete-merged-branch bot deleted the feature/app-config branch

May 10, 2024 13:11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels