Move to tea4j-autodeploy #1088

Merged

mmarif merged 49 commits from qwerty287/GitNex:autodeploy into main 2 months ago

qwerty287 commented 3 months ago

Collaborator

Move to https://codeberg.org/GitNex/tea4j-autodeploy as Retrofit interfaces. Closes #907 closes #1084

👍 1 👀 1 ❤️ 1 🚀 1

qwerty287 added this to the 4.3.0 milestone 3 months ago

qwerty287 added the

External-dependecy

Improvement

labels 3 months ago

qwerty287 added 1 commit 3 months ago

b259d9ef17

Move to tea4j-autodeploy

qwerty287 self-assigned this 3 months ago

qwerty287 commented 3 months ago

Poster

Collaborator

This also fixes parts of the crashes in #1082, so I recommend merging this before #1082.

qwerty287 added a new dependency 3 months ago

#1082 Fix crash on new app

qwerty287 referenced this pull request 3 months ago

Fix crash on new app #1082

qwerty287 referenced this pull request 3 months ago

[Bugs] Issues/bugs since #1034 pr merged #1084

6543 commented 3 months ago

Collaborator

please resolve conflicts :)

👍 1

qwerty287 added 2 commits 3 months ago

3668df75c2

Rm TODO comment

c2793378f7

Merge branch 'main' into autodeploy

qwerty287 added 1 commit 3 months ago

aff303a98d

Fix web auth

mmarif commented 3 months ago

Owner

Here are my findings so far(not finished, just what I tested).

~~1- creating issue return "something went wrong", Miletstone return the class name. See screen shot.~~

~~2- creating milestone, same here~~

~~3- create release(cannot select branch)~~

~~4- Adding colloborator does not return any user~~

~~5- Create pull request, no branches(shows class name)~~

~~6- Creating new file crahses the app~~

~~7- Tap on Notifications craches~~

IllegalArgumentException for org.mian.gitnex
    java.lang.IllegalArgumentException
        at java.util.Date.parse(Date.java:638)
        at java.util.Date.<init>(Date.java:274)
        at org.mian.gitnex.fragments.NotificationsFragment.loadNotifications(NotificationsFragment.java:154)
        at org.mian.gitnex.fragments.NotificationsFragment.onCreateView(NotificationsFragment.java:140)

~~8- Creating new repo crash app~~

~~9- Creating org label craches the app~~

So far I can say there are a lot of crashes.

My opionoin is we should not hurry this to 4.3.0 as we are arlready facing problems and bugs to fix. We should do one major refactor for one release.

Screenshot_20220320_211751.png

62 KiB

Screenshot_20220320_211521.png

36 KiB

qwerty287 commented 3 months ago

Poster

Collaborator

4.2.0 was released 1 month ago, I don't think we should keep this open for over a half year- just merge once finished and working.

👍 1

6543 commented 3 months ago

Collaborator

can you bump to tea4j-auto version a724545334c7ce30f0db07eda6fa4bbffd776347 ?

👍 1

qwerty287 added 1 commit 3 months ago

81dfc9a026

Fix issues and update tea4j

qwerty287 commented 3 months ago

Poster

Collaborator

Can't reproduce create file issues, but this happens if trying to delete it. What should happen with it?

java.lang.IllegalArgumentException: Non-body HTTP method cannot contain @Body.
        for method RepositoryApi.repoDeleteFile
        at retrofit2.Utils.methodError(Utils.java:54)
        at retrofit2.Utils.methodError(Utils.java:43)
        at retrofit2.RequestFactory$Builder.build(RequestFactory.java:213)
        at retrofit2.RequestFactory.parseAnnotations(RequestFactory.java:67)
        at retrofit2.ServiceMethod.parseAnnotations(ServiceMethod.java:26)
        at retrofit2.Retrofit.loadServiceMethod(Retrofit.java:202)
        at retrofit2.Retrofit$1.invoke(Retrofit.java:160)
        at java.lang.reflect.Proxy.invoke(Proxy.java:1006)
        at $Proxy1.repoDeleteFile(Unknown Source)
        at org.mian.gitnex.activities.CreateFileActivity.deleteFile(CreateFileActivity.java:248)
        at org.mian.gitnex.activities.CreateFileActivity.processNewFile(CreateFileActivity.java:162)
        at org.mian.gitnex.activities.CreateFileActivity.lambda$onCreate$4$CreateFileActivity(CreateFileActivity.java:122)
        at org.mian.gitnex.activities.-$$Lambda$CreateFileActivity$E5BVnG2eCjB5qQ-HmXRGcmgy2b0.onClick(Unknown Source:2)
        at android.view.View.performClick(View.java:7448)

6543 commented 3 months ago

Collaborator

I think the client can not work with https://gitea.com/api/swagger#/repository/repoDeleteFile

as if you follow a "strict" rest guide a delete is not allowed to have a body - but we need a body to pass the options

qwerty287 commented 3 months ago

Poster

Collaborator

That's a big problem, we had this issue another time. Gitea should follow the HTTP specs, maybe it could be possible to move something like this to query params (which is not a good idea, but the best). We can also take a look at https://github.com/square/retrofit/issues/330#issuecomment-25179351, but this will make it really hard to use autodeploy features because we would have to replace the usages of @DELETE where we need a body (which is pretty hard with a simple command line).

opyale commented 3 months ago

Collaborator

but this will make it really hard to use autodeploy features because we would have to replace the usages of @DELETE where we need a body (which is pretty hard with a simple command line).

You can always define custom classes with your own API endpoint descriptions when the generated code doesn't work as expected.

qwerty287 commented 3 months ago

Poster

Collaborator

Yeah I think I have to submit a pull request for this because I have been using some funcs directly in gitnex https://codeberg.org/qwerty287/GitNex/src/branch/autodeploy/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java#L150-L193

👍 1

opyale commented 3 months ago

Collaborator

Yeah I think I have to submit a pull request for this

Just enabled pull requests on the repository. 😉

qwerty287 commented 3 months ago

Poster

Collaborator

Ah thanks then just ignore my discord DM 🙃

qwerty287 added 1 commit 3 months ago

59aa8d6fc3

Update tea4j and rm custom funcs

qwerty287 added 1 commit 3 months ago

4afeedadba

Fix deletes with body

qwerty287 commented 3 months ago

Poster

Collaborator

@mmarif I think I fixed all the issues you mentioned.

👍 1

mmarif commented 3 months ago

Owner

@qwerty287 thanks, I will soon check it out.

At the mean time as we are moved to gitnex org, you can update the repo, https://codeberg.org/gitnex/tea4j-autodeploy.

👍 1

qwerty287 added 1 commit 3 months ago

12145f2810

Use gitnex repo

qwerty287 added 1 commit 3 months ago

e134b25a5a

Merge branch 'main' into autodeploy

mmarif commented 3 months ago

Owner

@qwerty287 can you resolve the conflicts?

👍 1

qwerty287 added 1 commit 3 months ago

24360d745e

Merge branch 'main' into autodeploy

mmarif added 1 commit 3 months ago

c21344f16e Merge branch 'main' into autodeploy

6543 started working 3 months ago

6543 commented 3 months ago

Collaborator

TODOs:

UnWatch Repos do not work
Create PullRequests do not work
Can not close milestones
Edit Issue/Pull, Milestone Dropdown show object not title

👍 2

6543 stopped working 3 months ago

40min 42s

qwerty287 commented 3 months ago

Poster

Collaborator

@6543 thanks, will fix them when I get some free time

❤️ 1

6543 referenced this pull request 3 months ago

Add Integration Tests #1098

qwerty287 added 2 commits 3 months ago

cca1f74b5e

Merge branch 'main' into autodeploy

2478e87f16

Merge branch 'autodeploy' of codeberg.org:qwerty287/GitNex into autodeploy

qwerty287 added 1 commit 3 months ago

aad669df72

Fix issues

mmarif commented 3 months ago

Owner

Test with the latest changes:

crash on commits
on create new issue getting something went wrong EDIT @qwerty287 can't reprocude - @mmarif see below task for detail.
crash on creating milestone EDIT @qwerty287 can't reprocude
crash on viewing releases after creating a release EDIT @qwerty287 can't reprocude - See the trace log below.
on creating new PR getting something went wrong
crash on commenting on PR EDIT @qwerty287 not related, mentioned in #1084
crash on edit org label
add/remove user to a team does not return anything
crash on releases/milestone/label tabs EDIT @qwerty287 can't reprocude - @mmarif trace log

java.lang.AssertionError
        at org.mian.gitnex.helpers.TimeHelper.customDateFormatForToast(TimeHelper.java:33)
        at org.mian.gitnex.adapters.MilestonesAdapter$DataHolder.bindData(MilestonesAdapter.java:193)
        at org.mian.gitnex.adapters.MilestonesAdapter.onBindViewHolder(MilestonesAdapter.java:62)

issues counter(tab) does not update if you go back to list and go to the repo again after creating new issue. That maybe the repo list is not updated I guess when go back?
assignee list is random and sometime adding users not part of the org and sometime add org as user. In that case once you add that user as assignee it will throw something went error. API issue maybe? Referring the 2nd task from top. EDIT @qwerty287 can't reprocude - @mmarif see the video attached. This most probably not related to this, but wondering why assignee API return org as user. Paul is org, not user here. @mmarif I will leave it here as it looks like an upstream issue.
if you close an issue and come back to the list. You will still see the issue even after refresh. It litterly does not close it. EDIT @qwerty287 can't reprocude - @mmarif see attach video.

new-issue-something-went-wrong.webm

162 KiB

Close-issue-after-creating-not-working.webm

479 KiB

qwerty287 added 1 commit 3 months ago

c60b97d296

Fix some issues

mmarif referenced this pull request 3 months ago

Extend my issue filter opts #1101

6543 commented 3 months ago

Collaborator

uff some conflicts ...

qwerty287 added 1 commit 3 months ago

6848097ac2

Merge branch 'main' into autodeploy

Conflicts:
	app/build.gradle
	app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
	app/src/main/java/org/mian/gitnex/activities/MainActivity.java
	app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
	app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
	app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
	app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
	app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/MyRepositoriesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/OrganizationsFragment.java
	app/src/main/java/org/mian/gitnex/fragments/RepositoriesByOrgFragment.java
	app/src/main/java/org/mian/gitnex/fragments/RepositoriesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/StarredRepositoriesFragment.java
	app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/MyRepositoriesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/OrganizationListViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesByOrgViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesListViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/StarredRepositoriesViewModel.java

qwerty287 added 2 commits 3 months ago

29991531d9

Fix some issues again

cc6873ab1f

Merge branch 'main' into autodeploy

qwerty287 added 1 commit 3 months ago

3fda2e3d71

Fix gradle files

qwerty287 added 1 commit 3 months ago

a03cf53fac

Fix some more issues

qwerty287 added 1 commit 3 months ago

9b3ae389ee

Undo gradle

qwerty287 added 2 commits 3 months ago

582dacea4e

Fix issue clicks

324aee90c7

Fix icon color after reopened

qwerty287 added 1 commit 3 months ago

7dc0b18e6c

Merge branch 'main' into autodeploy

Conflicts:
	app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
	app/src/main/java/org/mian/gitnex/actions/IssueActions.java
	app/src/main/java/org/mian/gitnex/actions/LabelsActions.java
	app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
	app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
	app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
	app/src/main/java/org/mian/gitnex/actions/TeamActions.java
	app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
	app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
	app/src/main/java/org/mian/gitnex/fragments/ExploreIssuesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/ExploreUsersFragment.java
	app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
	app/src/main/java/org/mian/gitnex/fragments/OrganizationTeamInfoMembersFragment.java
	app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/CollaboratorsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/FilesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/LabelsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/OrganizationLabelsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/ProfileEmailsViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/ReleasesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/RepoStargazersViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java
	app/src/main/java/org/mian/gitnex/viewmodels/TeamsByOrgViewModel.java

qwerty287 commented 3 months ago

Poster

Collaborator

@mmarif I'm not entirely sure, but I think the issues you found are mostly fixed.

👍 1

qwerty287 added 1 commit 3 months ago

f610ab4bf5

Update tea4j

mmarif commented 3 months ago

Owner

@qwerty287 I have tested the PR with latest changes. Most of the issues I mentioned are resolved, issue with org assignee is likely an upstream issue. So I will leave it there.

Here are the latest few issues from my quick test:

On creating new PR getting something went wrong
Adding new user to a team return upgrade to latest gitea warning
Issues(PR too maybe?) counter(tab) still does not update(after creating new issue) if you go back to the repo list and go to the repo screen again. That maybe the repo list is not updated I guess when go back?

mmarif removed a dependency 3 months ago

#1082 Fix crash on new app

qwerty287 added 2 commits 3 months ago

54a0722a22

Merge branch 'main' into autodeploy

46b1c0148a

Fix some issues

qwerty287 commented 3 months ago

Poster

Collaborator

Can't reproduce the PR issue.

mmarif commented 3 months ago

Owner

@qwerty287 See the attached video for PR test.

The issue counter tab for new issue is resovled. But if I close an issue, it still does not update the counter. Even going back and forth to the lists(repos -> issues).

One more thing, should I go for the login tests as mentioned in #1084?

something-went-wrong-pr-creation.webm

293 KiB

mmarif commented 3 months ago

Owner

Forgot to mention, the PR problem could be related to label/milestone/due date selection as just before that I did not choose them and PR was created.

Talking about PR creation, the counter updated as normal upon creation, but the list did not show the new PR until I pulled down to refresh.

Also same as issue, now if you close/reopen the PR, it does not change the counter in any way including going to the repos screen.

mmarif commented 3 months ago

Owner

If I click on the any issues/pr linked in the PR/issue(#10) and then go back to the main issue/pr(#10) screen, the pull to refresh does not refresh anymore.

Tested this after opening a linked issue/pr from a PR(#10). Then went to that same PR(#10) on the web and added new comment. Went back to the main PR(#10) screen(GitNex) and pulled to refresh, the new comment did not show up.

While testing that, the PR comment counter in the RP lists also did not update after going back to the list for that PR(#10).

qwerty287 commented 3 months ago

Poster

Collaborator

Forgot to mention, the PR problem could be related to label/milestone/due date selection as just before that I did not choose them and PR was created.

I actually tried to create one with everything set (labels, milestone, due date), and it was working.

mmarif commented 3 months ago

Owner

Forgot to mention, the PR problem could be related to label/milestone/due date selection as just before that I did not choose them and PR was created.

I actually tried to create one with everything set (labels, milestone, due date), and it was working.

Ok, I will debug on my side.

Just now I was adding codeberg account and was greeted with "you are not authorized"(invalid creds) error(from add new account screen).

I switched to main which worked, but then had another issue which I mentioned in the bugs issue already.

EDIT: this happens on login screen too with token and username/pw.

👍 1

qwerty287 added 2 commits 3 months ago

c01384e58b

Fix not reloaded repo counters

cf4e845da5

Fix reloading

qwerty287 commented 3 months ago

Poster

Collaborator

The refresh issue is a general issue, I'll open a separate issue (for issue comments, it's fixed now). -> #1107

mmarif added 1 commit 3 months ago

338a937b70 fix something went wrong for a PR

mmarif added 1 commit 3 months ago

d35d231ad4 optimize imports

qwerty287 added 1 commit 3 months ago

84d544e105

Fix first account issue

qwerty287 commented 3 months ago

Poster

Collaborator

OK, so I can reproduce the account issue but don't know how to fix it. The commit I pushed fixes another issue related to this.
What I found out so far:

tokens etc. are always correct
it seems that the okhttp interceptors do not add the requested headers. Both Authorization and Cache-Control are not set in the Call value. (Thus it does not work, Authorization is missing)

mmarif commented 3 months ago

Owner

So this new code introduced is not working then: .addInterceptor(auth)

EDIT: but what I am wondering is all API calls need that auth for completion, so it's not different than other calls. It must be something else somewhere.

qwerty287 commented 3 months ago

Poster

Collaborator

I seems that it works for accounts already added / on other API requests. (The token is not the issue, tested that with a println - it is available and correct.)

mmarif added 1 commit 3 months ago

6837665fac Fix login and creating new account when token is used.

mmarif commented 3 months ago

Owner

@qwerty287 I had a look at it, and fixed the login for tokens so far. Username/pw need a look still I guess.

Just noticed along the way, you used AppUtil.switchToAccount(AddNewAccountActivity.this, account);, while this is fine it does not refresh the view. Do you have any refresh call/method to use here?

qwerty287 commented 3 months ago

Poster

Collaborator

Oh you're right, didn't do this. But that's not related to this PR.

mmarif commented 3 months ago

Owner

But that's not related to this PR.

Maybe it's not. But I thought if there is a way to fix it straight away.

qwerty287 commented 3 months ago

Poster

Collaborator

Yeah, feel free to do it, I can do it if I get some time.

mmarif added 1 commit 3 months ago

66cea3ef8c Fix login by username and pw

mmarif commented 3 months ago

Owner

Yeah, feel free to do it, I can do it if I get some time.

Sure, I will look into it soon.

Bdw while testing this. I noticed if I log out and login with another account. I see not logged in text and no account in the nav drawer. Was this added in the other PR.
I feel the UX is not that good here. The old flow is fine to me. Show all accounts in nav and popup. once click just switch it. It is a seemless experience for user.

mmarif commented 3 months ago

Owner

Bdw while testing this. I noticed if I log out and login with another account. I see not logged in text and no account in the nav drawer. Was this added in the other PR.
I feel the UX is not that good here. The old flow is fine to me. Show all accounts in nav and popup. once click just switch it. It is a seemless experience for user.

But for now I will leave it, we can discuss this later.

qwerty287 commented 3 months ago

Poster

Collaborator

What I added was the logout system which allows logging in again. If you log out, the account is marked as logged out. The account is not shown on the nav drawer, but the alert dialog. There you can log in again. My main reason to change that was that the logout button is useless. You can't login again, and the LoginActivity is launched and can't be finished / exited, even after app restart. This is definitely a very bad UX. Another way would be to just remove the logout support and only keep the delete account option.

mmarif added 1 commit 3 months ago

e88f11442b clean up and show all accounts in nav

mmarif commented 3 months ago

Owner

And how let's say I am going to add an account with username/pw if I delete an account and has only one account left in the app now?

We can't log out user with each delete for sure.

qwerty287 commented 3 months ago

Poster

Collaborator

If I log out of an account and have other accounts configured, I expect that the app switches to another account or at least give me the option to switch to it.

add an account with username/pw

What about username/pw support on AddNewAccountActivity?

We should rethink about the whole logout/account removal system and how this should be handled.

mmarif commented 3 months ago

Owner

Accessing notifications:

/api/v1/notifications?all=false&status-types=pinned&status-types=unread&since=Thu%20Jan%2001%2000%3A00%3A00%20GMT%201970&page=1&limit=25 422 Unprocessable Entity

mmarif commented 3 months ago

Owner

If I log out of an account and have other accounts configured, I expect that the app switches to another account or at least give me the option to switch to it.

add an account with username/pw

What about username/pw support on AddNewAccountActivity?

We should rethink about the whole logout/account removal system and how this should be handled.

Yes, anything regarding UX/UI we should discuss in the chat and how we can come up with a better solution for it.

Let's discuss this after 4.3.0 release.

👍 1

qwerty287 added 1 commit 3 months ago

60432b6951

Fix date format

qwerty287 commented 3 months ago

Poster

Collaborator

@mmarif could you try again with 60432b6951?

qwerty287 commented 3 months ago

Poster

Collaborator

See https://stackoverflow.com/questions/57376366/pass-query-date-param-in-specific-format for details.

mmarif commented 3 months ago

Owner

@mmarif could you try again with 60432b6951?

Looks good. What about creating a custom endpoint with data type as string not date like last time?

Will this effect other calls with date?

qwerty287 commented 3 months ago

Poster

Collaborator

The commit fixed all date usages.

👍 1

mmarif added 1 commit 3 months ago

7f01708487 fix crash on commenting on pr

mmarif commented 3 months ago

Owner

This PR is pretty much there in terms of testing..

Will go through a round or two once fixed all the pending tasks(1 left) from #1084.

@qwerty287 if you found any other issues mentioned here or came across, please feel free to fix them.

👍 1

qwerty287 added 1 commit 2 months ago

ab7897e7d4

Fix file reloading

mmarif commented 2 months ago

Owner

@qwerty287 just tested the reload patch and unfortunately it is not reloading the file. Maybe something is missing in process of editFileLauncher. Maybe result is empty because it is not launched from edit file?

If that's not working, you can always use a bundle and onResume to call getSingleFileContents.

qwerty287 commented 2 months ago

Poster

Collaborator

You're right, change https://codeberg.org/gitnex/GitNex/src/branch/main/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java#L299 (can't do it now).

👍 1

mmarif commented 2 months ago

Owner

Thanks, I will change it in a while.

👍 1

mmarif added 1 commit 2 months ago

403c8c43a9 fix edit file result listner

mmarif added 1 commit 2 months ago

47f6df01db Refresh after new account addition

mmarif added 1 commit 2 months ago

5e276f9b5b Fix crash filter by milestone and refresh/load more for milestone

mmarif commented 2 months ago

Owner

@qwerty287 I have fixed few issues I came across. So far all is looking good. I will test it throughly one or two times again. If nothing, then will merge it. If there are things to fix, will fix what I can or list them here so you can try too.

👍 1

mmarif added 1 commit 2 months ago