Clean up remaining Google Drive projects #5830

grzesiek2010 · 2023-11-09T15:38:45Z

Why is this the best possible solution? Were any other approaches considered?

The only thing of note here is that I've removed the protocol from server settings at all:

It's just one protocol now and we are not going add anything there soon I guess so it doesn't make sense to display it.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

This removed GD integration completely. In one of the previous versions, we have added removing GD project that didn't have any unsent forms. Here we go one step further and if there are still projects like that we convert them to ODK protocol and get rid of the whole code responsible for working with GD.
That means we need to test that:

after upgrading from a version with a GD project without any filled forms the project does not exist anymore
after upgrading from a version with a GD project with filled forms the project exists but it's not a GD project anymore. There also should be a banner displayed in the main menu saying that's it's an old GD project.

Do we need any specific form for testing your changes? If so, please attach one.

No.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

Before submitting this PR, please make sure you have:

added or modified tests for any new or changed behavior
run ./gradlew checkAll and confirmed all checks still pass OR confirm CircleCI build passes and run ./gradlew connectedDebugAndroidTest locally.
added a comment above any new strings describing it for translators
verified that any code or assets from external sources are properly credited in comments and/or in the about file.
verified that any new UI elements use theme colors. UI Components Style guidelines

grzesiek2010 · 2023-11-10T10:44:25Z

This pull request removes Google Drive functionality converting GD projects that couldn't be removed to ODK protocol so we need to update the banner:

This should say something like: This project used Google Drive. The functionality was removed in the latest app update.
@alyblenkin can you help?

.circleci/config.yml

.../src/androidTest/java/org/odk/collect/android/feature/projects/GoogleDriveDeprecationTest.kt

settings/src/main/java/org/odk/collect/settings/keys/ProjectKeys.kt

seadowg · 2023-11-15T13:35:52Z

...c/main/java/org/odk/collect/android/application/initialization/GoogleDriveProjectsDeleter.kt

+                if (result == DeleteProjectResult.UnsentInstances || result == DeleteProjectResult.RunningBackgroundJobs) {
+                    unprotectedSettings.save(ProjectKeys.KEY_PROTOCOL, ProjectKeys.PROTOCOL_SERVER)
+                    unprotectedSettings.save(ProjectKeys.KEY_SERVER_URL, "https://example.com")
+                    settingsProvider.getMetaSettings().save(MetaKeys.getKeyIsOldGDProject(it.uuid), true)


Why save this to meta settings and not just to normal ("unprotected") settings?

My thinking was that unprotected settings represent the section of unprotected preferences in the app, the same with the protected ones and if we want to save something that does not have a visual representation then it should be in meta settings.

I'd more thought that anything that's a "project" level goes in "unprotected". I guess this is really information "about" the project itself rather than a setting so I do see why it's in meta, but it feels a little awkward that you have to still index by project. Would it be a possibility that this could live on Project itself?

Would it be a possibility that this could live on Project itself?

Yeah, I think it's a good idea.

collect_app/src/main/java/org/odk/collect/android/instancemanagement/SubmitException.kt

…gment

…duler

alyblenkin · 2023-11-16T19:04:01Z

This pull request removes Google Drive functionality converting GD projects that couldn't be removed to ODK protocol so we need to update the banner: This should say something like: This project used Google Drive. The functionality was removed in the latest app update. @alyblenkin can you help?

Sorry for missing this comment! What about:

"Your project uses Google Drive. This functionality will be removed X date."

I think it would be great to say the exact date, rather than people having to figure out when it's going to happen.

lognaturel · 2023-11-16T19:12:03Z

@alyblenkin this is one last informational message for people who still had submissions in their GDrive projects.

"This project was previously connected to a Google Drive account. Google Drive support has been removed. You can configure a server or pull submissions to a computer."

The last sentence could just be in the "learn more" but it seems somewhat helpful to give an idea of what needs to be done now.

seadowg

#5830 (comment)

dbemke · 2024-01-09T12:53:15Z

I installed 2022.4.4 and created a GD project with a draft and a finalized form. I upgraded Collect there is no banner in the main menu.

dbemke · 2024-01-10T08:51:32Z

@grzesiek2010 Would you like me to file the issue above in a separate issue?

grzesiek2010 · 2024-01-10T10:11:25Z

@dbemke I think this would be the best approach - file new issues if you test pull requests that are already merged.

dbemke · 2024-01-12T12:56:32Z

Tested with Success!

Verified on a device with Android 10

Verified cases:

filed issue No banner about GD project after upgrading to the current version #5903
upgrading a GD project with saved forms and without saved forms
upgrading when there is a GD project and the demo project
adding project after upgrading
trying to reconfigure an upgraded GD project with a QR code with an old GD project
reconfiguring an upgraded GD project with a QR code with Central project
upgrading 2022.4.4 to 2023.2.0 and then to the PR version
resetting the upgraded GD project

srujner · 2024-01-12T12:58:58Z

Tested with Success!

Verified on a device with Android 13

grzesiek2010 force-pushed the COLLECT-5403 branch 4 times, most recently from c643abb to 3cdd5af Compare November 10, 2023 09:53

grzesiek2010 marked this pull request as ready for review November 10, 2023 11:12

seadowg requested changes Nov 15, 2023

View reviewed changes

grzesiek2010 added 23 commits November 16, 2023 18:38

Convert GD projects that cannot be deleted to ODK protocol

b27a3df

Added tests

cc7ec05

Mark old gd projects

09d00ce

Improve tests

970d23a

Disply the GD deprecation banner only if it's an old GD project

8661563

Fixed GoogleDriveDeprecationTest

8921ca9

Removed unused getAppConfigurationAsJsonWithGoogleDriveDetails

7d285bc

Removed GD from InstanceSubmitter

74e5a29

Removed checking GD from FormUriActivity

a72dff5

Removed redundant protocol check from SettingsImporter

c7e9277

Removed redundant protocol check from SettingsUtils

4f66f1e

Removed redundant protocol check from FormManagementPreferencesFragment

6979e56

Removed redundant protocol check from ProjectListItemView

f4810c6

Removed redundant protocol check from ProjectManagementPreferencesFra…

cf64a5b

…gment

Removed redundant protocol check from CollectSettingsChangeHandler

fbafa54

Removed redundant protocol check from MainMenuActivity

e15fabd

Removed GD integration from ServerPreferencesFragment

0e9153a

Removed redundant protocol check from InstanceUploaderListActivity

5ed3618

Removed redundant protocol check from FormUpdateAndInstanceSubmitSche…

3d537d7

…duler

Removed redundant protocol check from SettingsConnectionMatcher

7402072

Removed redundant tests from MainMenuAccessPreferencesTest

e680468

Removed redundant protocol set from BlankFormListViewModelTest

75fdf6c

Removed redundant test from GoogleDriveDeprecationTest

f4029fe

grzesiek2010 added 7 commits November 16, 2023 18:38

Removed unused code

01b5e88

Removed redundant dependencies

2906625

Removed unused keys

33f55c3

Updated README

f373216

Removed redundant test from ServerSettingsTest

4a25573

Decreased the apk size limit

a0aa948

Simplified SubmitException

44e50c5

grzesiek2010 force-pushed the COLLECT-5403 branch from 2af5a37 to 514f869 Compare November 16, 2023 18:12

grzesiek2010 added 2 commits November 16, 2023 19:26

Moved addProject method to the class that uses it

e5bc86f

Increased the apk size limit

ba96de2

grzesiek2010 force-pushed the COLLECT-5403 branch from 514f869 to ba96de2 Compare November 16, 2023 18:30

grzesiek2010 added 2 commits November 16, 2023 23:51

Updated the message displayed in the banner

eac2a01

Removed unused code

9e1ed70

grzesiek2010 requested a review from seadowg November 16, 2023 23:05

seadowg requested changes Nov 17, 2023

View reviewed changes

Store information about old GD projects on a project level

f78a62f

grzesiek2010 requested a review from seadowg November 21, 2023 00:22

seadowg approved these changes Nov 28, 2023

View reviewed changes

seadowg added the needs testing label Nov 28, 2023

grzesiek2010 merged commit 836d5da into getodk:master Dec 7, 2023
6 checks passed

dbemke mentioned this pull request Jan 10, 2024

No banner about GD project after upgrading to the current version #5903

Closed

srujner added behavior verified and removed needs testing labels Jan 12, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up remaining Google Drive projects #5830

Clean up remaining Google Drive projects #5830

grzesiek2010 commented Nov 9, 2023 •

edited

Loading

grzesiek2010 commented Nov 10, 2023

seadowg Nov 15, 2023

grzesiek2010 Nov 16, 2023

seadowg Nov 17, 2023

grzesiek2010 Nov 21, 2023

alyblenkin commented Nov 16, 2023

lognaturel commented Nov 16, 2023 •

edited

Loading

seadowg left a comment

dbemke commented Jan 9, 2024

dbemke commented Jan 10, 2024

grzesiek2010 commented Jan 10, 2024

dbemke commented Jan 12, 2024

srujner commented Jan 12, 2024

Clean up remaining Google Drive projects #5830

Clean up remaining Google Drive projects #5830

Conversation

grzesiek2010 commented Nov 9, 2023 • edited Loading

Why is this the best possible solution? Were any other approaches considered?

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

Do we need any specific form for testing your changes? If so, please attach one.

Does this change require updates to documentation? If so, please file an issue here and include the link below.

Before submitting this PR, please make sure you have:

grzesiek2010 commented Nov 10, 2023

seadowg Nov 15, 2023

Choose a reason for hiding this comment

grzesiek2010 Nov 16, 2023

Choose a reason for hiding this comment

seadowg Nov 17, 2023

Choose a reason for hiding this comment

grzesiek2010 Nov 21, 2023

Choose a reason for hiding this comment

alyblenkin commented Nov 16, 2023

lognaturel commented Nov 16, 2023 • edited Loading

seadowg left a comment

Choose a reason for hiding this comment

dbemke commented Jan 9, 2024

dbemke commented Jan 10, 2024

grzesiek2010 commented Jan 10, 2024

dbemke commented Jan 12, 2024

srujner commented Jan 12, 2024

grzesiek2010 commented Nov 9, 2023 •

edited

Loading

lognaturel commented Nov 16, 2023 •

edited

Loading