Fix #1908:Changed comments in Proto files #1913

Victor-Titan · 2020-09-27T17:31:19Z

Explanation

Fixes Fix comments broken in #1876 #1908
Changed org.oppia.android.android/ to org/oppia/android/android/ in the comments of the proto files

Checklist

The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
The PR follows the style guide.
The PR does not contain any unnecessary auto-generated code from Android Studio.
The PR is made from a branch that's not called "develop".
The PR is made from a branch that is up-to-date with "develop".
The PR's branch is based on "develop" and not on any other branch.
The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

oppiabot · 2020-09-27T17:31:21Z

Hi! @Victor-Titan, Welcome to Oppia! Please could you follow the instructions here to get started? You'll need to do this before we can accept your PR. I am closing this PR for now. Feel free to re-open it once you are done with the above instructions. Thanks!

Sarthak2601 · 2020-09-28T11:12:27Z

Hey @Victor-Titan! Thanks for contributing to Oppia :)
There are a couple of things that you can do to improve your pull requests -

Follow this guide.
Always claim the issue first (by commenting on it or by self assigning) and then open a PR corresponding to that issue. Right now, the issue that you've opened up your PR for, has been assigned to someone else.
The title of you PR should be - Fix #1908: Changed comments in Proto file.

Happy contributing 👍

anandwana001

Thanks @Victor-Titan
Added a few points to check on. Let me know if you need any help on these.

.idea/codeStyles/Project.xml

build.gradle

Sarthak2601

Thanks @Victor-Titan. Suggested just one change.

Sarthak2601 · 2020-09-28T17:02:01Z

.idea/codeStyles/Project.xml

@@ -161,4 +161,4 @@
      </indentOptions>
    </codeStyleSettings>
  </code_scheme>
-</component>
+</component>


Please don't push .idea file changes. You can simply delete this file from your PR.

Done, I didn't know we could delete that, else I would've just done that instead of changing the code

Wait, this is incorrect actually. What you've done might lead to deleting of the file from our codebase itself. I'll defer to @anandwana001 on this.

I think the steps you should take here is:

Update your branch with the latest develop branch. (pull + push or fetch + merge + commit + push)

Now, the .idea/codeStyles/Project.xml will be added to your branch, as coming from the latest develop branch.

Now, you will see the file is same as this file https://github.com/oppia/oppia-android/blob/develop/.idea/codeStyles/Project.xml and no changes will be shown into your branch, meaning Android Studio is not updating this file.

Now, in this PR you will only see 3 files changed which is our proto file where you had solved this issue.

As per @Sarthak2601 deleting this file from your pr means you can rollback the changes in this file and then commit.

Victor-Titan · 2020-09-29T03:18:23Z

PTAL @Sarthak2601 @anandwana001 I've implemented the changes you asked

anandwana001

We don't need to delete .idea/codeStyles/Project.xml but keep it unchanged.
Merge your branch with the latest develop branch.

Victor-Titan · 2020-09-29T10:27:20Z

I pulled the code from the main repo and commited again, but the tests showed a build fail in the part of the code I pulled. If there was a build fail issue then how was that code merged to develop? PTAL @anandwana001

anandwana001 · 2020-09-29T11:19:02Z

I pulled the code from the main repo and commited again, but the tests showed a build fail in the part of the code I pulled. If there was a build fail issue then how was that code merged to develop? PTAL @anandwana001

This particular test is passing for me. And also passing on the latest develop branch. Let's just first clear the .idea/codeStyles/Project.xml issue we are having in this PR and then we can see if the test fails or not, It's not dependent on that particularly but then we can update the branch again. Also, force push is not much recommended.

aggarwalpulkit596 · 2020-09-29T11:22:27Z

@Victor-Titan hey victor let's do one thing let's clean up your fork first. For that you can do things either delete the existing one and make new one or add a remote

prayutsu · 2020-09-29T11:25:28Z

@Victor-Titan Have you installed the Kotlin-plugin in your Android Studio, if you want to fix that Project.xml issue, you can uninstall it, it's not of much use. This bug is actually shipped with the latest version of the Kotlin Plug-in.

prayutsu · 2020-09-29T11:33:48Z

I pulled the code from the main repo and commited again, but the tests showed a build fail in the part of the code I pulled. If there was a build fail issue then how was that code merged to develop? PTAL @anandwana001

This problem has been experienced by a lot of developers recently, and as for now the best solution to avoid this is to uninstall the Kotlin Plug-in, if you haven't installed Kotlin Plug-in then let me know, I'll suggest another way to fix it.

Victor-Titan · 2020-09-29T12:12:49Z

@prayutsu @aggarwalpulkit596 @anandwana001 I removed the Kotlin plugin and also deleted my existing fork and made a new one, but when I went ahead with committing, the .idea/codeStyles/Project.xml file still got changed. Please help. While I can remove that file while committing code, doing so everytime seems tedient

aggarwalpulkit596 · 2020-09-29T12:36:35Z

This PR should be closed in that case ? And it won't be pushed for sure for a new fork I'm pretty sure about that this entire folder has been added to gitignore so that case shouldn't be there

prayutsu · 2020-09-29T13:25:08Z

@prayutsu @aggarwalpulkit596 @anandwana001 I removed the Kotlin plugin and also deleted my existing fork and made a new one, but when I went ahead with committing, the .idea/codeStyles/Project.xml file still got changed. Please help. While I can remove that file while committing code, doing so everytime seems tedient

Okay

I want you to confirm one thing, if you have successfully uninstalled Kotlin plug-in, then please try deleting that extra piece of code one last time and try committing changes.

If it still appears again then please follow the steps -

You have to restore your Android Studio Settings to default. Assuming that you are on windows, I
am sharing a link to do this.

https://stackoverflow.com/questions/20582577/how-to-reset-to-default-configuration-in-android-studio/31228003

If you are on linux or mac then do let me know.

Also after doing this don't forget to delete the extra code that is getting appeared again and again. After deleting one last time, you should not encounter this error.

prayutsu · 2020-09-29T13:26:45Z

Also, if you can please share the Screenshot to confirm that you have successfully uninstalled the Kotlin plug-in, because I am quite sure that this problem comes with the latest release of Kotlin plug-in.

prayutsu · 2020-09-29T13:32:15Z

@Victor-Titan Also, Android Studio will prompt you again and again by showing the dialog bubble in the bottom right corner but do not install the Kotlin Plugin for now.

Victor-Titan · 2020-09-29T13:58:30Z

@prayutsu I can't seem to uninstall the Kotlin Plugin, I'm only allowed to disable it. When I tried disabling it, a message popped up showing that it was part of a bundle of other google plugins including Firebase(I've not installed any of them, I think they were there to start with) and when I disabled them all and restarted, I got a message like this

I'm on Linux. Also, there was another Kotlin Plugin which I had installed back when I started Android dev in Kotlin. I think I uninstalled that one.

Victor-Titan · 2020-09-29T14:20:56Z

@prayutsu @anandwana001 I'm closing this PR as I created a new PR when I pushed code to a new fork as @aggarwalpulkit596 suggested.

Fixed the incorrect paths written in the proto files

bd327f3

oppiabot bot closed this Sep 27, 2020

Sarthak2601 reopened this Sep 28, 2020

Victor-Titan changed the title ~~Fixed #1876~~ Fix #1876:Changed comments in Proto files Sep 28, 2020

Victor-Titan changed the title ~~Fix #1876:Changed comments in Proto files~~ Fix #1908:Changed comments in Proto files Sep 28, 2020

Sarthak2601 requested review from anandwana001 and rt4914 September 28, 2020 12:14

Sarthak2601 assigned rt4914 and anandwana001 Sep 28, 2020

anandwana001 suggested changes Sep 28, 2020

View reviewed changes

.idea/codeStyles/Project.xml Show resolved Hide resolved

build.gradle Outdated Show resolved Hide resolved

anandwana001 assigned Victor-Titan and unassigned anandwana001 Sep 28, 2020

Removed extra code in Project.xml file and an extra line in build.gradle

c5a7bcf

Victor-Titan requested a review from anandwana001 September 28, 2020 14:31

Removed extra code in Project.xml file

c770a7a

Sarthak2601 suggested changes Sep 28, 2020

View reviewed changes

Sarthak2601 removed the request for review from rt4914 September 28, 2020 17:04

Sarthak2601 unassigned rt4914 Sep 28, 2020

Victor-Titan requested a review from Sarthak2601 September 29, 2020 03:17

anandwana001 suggested changes Sep 29, 2020

View reviewed changes

Victor-Titan added 2 commits September 29, 2020 15:05

Merge remote-tracking branch 'upstream/develop' into fix-comments-broken

db0ab84

Merged new changes from develop branch to local repo

1536b51

Victor-Titan closed this Sep 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #1908:Changed comments in Proto files #1913

Fix #1908:Changed comments in Proto files #1913

Victor-Titan commented Sep 27, 2020 •

edited

oppiabot bot commented Sep 27, 2020

Sarthak2601 commented Sep 28, 2020

anandwana001 left a comment

Sarthak2601 left a comment

Sarthak2601 Sep 28, 2020

Victor-Titan Sep 28, 2020

Sarthak2601 Sep 28, 2020

anandwana001 Sep 29, 2020 •

edited

Victor-Titan commented Sep 29, 2020

anandwana001 left a comment

Victor-Titan commented Sep 29, 2020

anandwana001 commented Sep 29, 2020

aggarwalpulkit596 commented Sep 29, 2020

prayutsu commented Sep 29, 2020

prayutsu commented Sep 29, 2020 •

edited

Victor-Titan commented Sep 29, 2020

aggarwalpulkit596 commented Sep 29, 2020 •

edited

prayutsu commented Sep 29, 2020 •

edited

prayutsu commented Sep 29, 2020

prayutsu commented Sep 29, 2020

Victor-Titan commented Sep 29, 2020

Victor-Titan commented Sep 29, 2020

Fix #1908:Changed comments in Proto files #1913

Fix #1908:Changed comments in Proto files #1913

Conversation

Victor-Titan commented Sep 27, 2020 • edited

Explanation

Checklist

oppiabot bot commented Sep 27, 2020

Sarthak2601 commented Sep 28, 2020

anandwana001 left a comment

Choose a reason for hiding this comment

Sarthak2601 left a comment

Choose a reason for hiding this comment

Sarthak2601 Sep 28, 2020

Choose a reason for hiding this comment

Victor-Titan Sep 28, 2020

Choose a reason for hiding this comment

Sarthak2601 Sep 28, 2020

Choose a reason for hiding this comment

anandwana001 Sep 29, 2020 • edited

Choose a reason for hiding this comment

Victor-Titan commented Sep 29, 2020

anandwana001 left a comment

Choose a reason for hiding this comment

Victor-Titan commented Sep 29, 2020

anandwana001 commented Sep 29, 2020

aggarwalpulkit596 commented Sep 29, 2020

prayutsu commented Sep 29, 2020

prayutsu commented Sep 29, 2020 • edited

Victor-Titan commented Sep 29, 2020

aggarwalpulkit596 commented Sep 29, 2020 • edited

prayutsu commented Sep 29, 2020 • edited

prayutsu commented Sep 29, 2020

prayutsu commented Sep 29, 2020

Victor-Titan commented Sep 29, 2020

Victor-Titan commented Sep 29, 2020

Victor-Titan commented Sep 27, 2020 •

edited

anandwana001 Sep 29, 2020 •

edited

prayutsu commented Sep 29, 2020 •

edited

aggarwalpulkit596 commented Sep 29, 2020 •

edited

prayutsu commented Sep 29, 2020 •

edited