Skip to content
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.

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

add privacy policy #10785

Merged
merged 5 commits into from Nov 7, 2016

Conversation

@ronie
Copy link
Member

commented Oct 26, 2016

as reported by @MartijnKaijser on trac (http://trac.kodi.tv/ticket/17016) it's mandatory to provide a way for users to read our privacy policy within kodi.

this pr adds this functionality to the systeminfo window.

please check if i got the install path on each platform correct, the file should be available in special://xbmc/
(assuming we want to save it there...)

privacypolicy

@ronie

This comment has been minimized.

Copy link
Member Author

commented Oct 26, 2016

  • todo: read the file only once, on window open (instead of each time the button is focused)

done.


[B]What do we do with your information once we have it?[/B]

Generally, we use your information to help us provide and improve our software and services for you (e.g., we use a log you send us to figure out why Kodi isn’t playing a video right or why it might have crashed, or we determine how many active users are using each platform in order to determine how to allocate resources per platform).

This comment has been minimized.

Copy link
@da-anda

da-anda Oct 26, 2016

Member

shouldn't it be sent instead of send in "e.g., we use a log you sent us to figure..."

This comment has been minimized.

Copy link
@ronie

ronie Oct 26, 2016

Author Member

i didn't proof-read it ;-)
it's a copy of our policy taken from here: https://kodi.tv/kodi-privacy-policy/

This comment has been minimized.

Copy link
@hudokkow

hudokkow Oct 26, 2016

Member

ping @jjd-uk to proof-read it

This comment has been minimized.

Copy link
@garbear

garbear Oct 26, 2016

Member

The document uses simple present tense, so send is correct

install(FILES ${CORE_SOURCE_DIR}/privacy-policy.txt
DESTINATION ${datarootdir}${APP_NAME_LC}
COMPONENT kodi)

This comment has been minimized.

Copy link
@hudokkow

hudokkow Oct 26, 2016

Member

Any reason you didn't used the code block above and install it to ${datarootdir}/doc/${APP_NAME_LC}, same as the other files?

This comment has been minimized.

Copy link
@ronie

ronie Oct 26, 2016

Author Member

special://xbmc/ points to ${datarootdir}${APP_NAME_LC}
(i need a special path as those are the same across platforms)

This comment has been minimized.

Copy link
@hudokkow

hudokkow Oct 26, 2016

Member

Gotcha!

[B]When do we share your information with others?[/B]

• When we have asked and received your permission to share it.
• When we are fulfilling our educational purpose. We sometimes publicly release information to make our software better and foster an open web, but when we do so, we will remove your personal information and try to disclose it in a way that minimizes the risk of you being re-identified. For example, here is a blog post where we attempt to analyze from available data how many active users of XBMC existed at the time and share that info with the community.

This comment has been minimized.

Copy link
@garbear

garbear Oct 26, 2016

Member

I suggest we change:

For example, here is a blog post where we attempt to analyze...

to:

For example, in a blog post we might attempt to analyze...

Also, XBMC -> Kodi

This comment has been minimized.

Copy link
@natethomas

natethomas Oct 26, 2016

Member

Good change. The original language is based on having a link to a blog post, which we obviously can't have here.

This comment has been minimized.

Copy link
@ronie

ronie Oct 26, 2016

Author Member

both fixed now

@garbear

This comment has been minimized.

Copy link
Member

commented Oct 26, 2016

Overall, I think we have a good privacy policy. Good job guys.

@ronie ronie force-pushed the ronie:privacypolicy branch from fe3f5af to c8df407 Oct 26, 2016

@Hedda

This comment has been minimized.

Copy link
Contributor

commented Oct 27, 2016

Should this privacy policy be translated via Transifex when shown in the GUI?

http://www.transifex.com/teamxbmc/kodi-main/

If not using English inside Kodi then could expect this to be translated too?

@MartijnKaijser

This comment has been minimized.

Copy link
Member

commented Oct 27, 2016

@Hedda sorry but that would be a really bad idea cause as we noticed in general the translations are quite horribly done. As this is a "legal" document you cannot trust regular users to translate it.

@ronie ronie force-pushed the ronie:privacypolicy branch 2 times, most recently from ea03d6c to b7297e4 Oct 27, 2016

return strBuf;
}
else
return "";

This comment has been minimized.

Copy link
@tamland

tamland Oct 29, 2016

Member

Please always log errors;)

@tamland

This comment has been minimized.

Copy link
Member

commented Oct 29, 2016

I think this should rather be added as an info label (similar to all the other system info). Loading a file in CGUIWindowSystemInfo is going to cause it to lag, and the privacy policy will be coupled to and only viewable in this specific window.

@fetzerch

This comment has been minimized.

Copy link
Member

commented Oct 29, 2016

For android this has to be added to https://github.com/xbmc/xbmc/blob/master/tools/android/packaging/Makefile.in#L111 i think. But I'm not sure which directory it needs to go inside the apk. maybe @koying can help here?

@ronie ronie force-pushed the ronie:privacypolicy branch from c26c678 to 9f516c0 Nov 3, 2016

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 3, 2016

@tamland moved the functionality to CSysInfo and made it available as an infolabel.
please check if this is what you've had in mind.

@ronie ronie force-pushed the ronie:privacypolicy branch from 9f516c0 to d757f38 Nov 3, 2016

@MartijnKaijser

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

Now also works on Android.
Any chance of making it possible to scroll through the text manually?

@MartijnKaijser

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

@Memphiz @fetzerch could you check on iOS?

@Memphiz

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

@MartijnKaijser how am i supposed to scroll down in the policy? (just trying it out on osx - its shown - but only the upper lines which fit into the sysinfo rect ...)

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 6, 2016

currently it autoscrolls, i'll look into adding a scrollbar.

@Memphiz

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

works on ios too

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 6, 2016

cool, all platforms confirmed working then.

@ronie ronie force-pushed the ronie:privacypolicy branch from d757f38 to ffa4c18 Nov 6, 2016

@ronie ronie removed the RFC label Nov 6, 2016

@MartijnKaijser MartijnKaijser added this to the Krypton 17.0-beta6 milestone Nov 6, 2016

@MartijnKaijser

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

Tested and looks fine to me. Jenkins build this please.
@tamland was the implementation ok?

@tamland

This comment has been minimized.

Copy link
Member

commented Nov 6, 2016

yeah, looks good

{
SET_CONTROL_LABEL(13, g_infoManager.GetLabel(SYSTEM_PRIVACY_POLICY));
SET_CONTROL_VISIBLE(13);
}
return true;

This comment has been minimized.

Copy link
@phil65

phil65 Nov 6, 2016

Member

just

if (m_section >= CONTROL_START && m_section <= CONTROL_END)
{
 SET_CONTROL_HIDDEN(13);
}

should be fine.
For bonus points, use a #define for the textbox (and perhaps adjust the id to something higher so that we could still attach additional lines in the future without hassle). :)

This comment has been minimized.

Copy link
@phil65

phil65 Nov 6, 2016

Member

oops, I meant
if (m_section >= CONTROL_START && m_section <= CONTROL_BT_PVR)
...or make it a switch :)

@ronie ronie force-pushed the ronie:privacypolicy branch from ffa4c18 to efc36c8 Nov 6, 2016

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 6, 2016

updated as @phil65 suggested.

Jenkins build this please.


else if (m_section == CONTROL_BT_POLICY)
{
SET_CONTROL_LABEL(40, g_localizeStrings.Get(12389));

This comment has been minimized.

Copy link
@phil65

phil65 Nov 6, 2016

Member

the 40 should be CONTROL_TB_POLICY? :)

This comment has been minimized.

Copy link
@phil65

phil65 Nov 6, 2016

Member

oops, sorry. false alarm.

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 7, 2016

works on ios too

jenkins says no

@Memphiz

This comment has been minimized.

Copy link
Member

commented Nov 7, 2016

i guess because Jenkins builds with cmake - i didn't ...

@Memphiz

This comment has been minimized.

Copy link
Member

commented Nov 7, 2016

@ronie i think you Need to add privacy-policy.txt to this file here:

https://github.com/xbmc/xbmc/blob/master/project/cmake/installdata/ios/packaging.txt

and here

https://github.com/xbmc/xbmc/blob/master/project/cmake/installdata/osx/packaging.txt

because on osx it failed "silently" too:

rsync: link_stat "/Users/Shared/jenkins/workspace/OSX-64/build/privacy-policy.txt" failed: No such file or directory (2)

@fetzerch any idea why osx Fails silently and ios correclty Fails the Job?

@ronie ronie force-pushed the ronie:privacypolicy branch from efc36c8 to 07f646b Nov 7, 2016

@ronie

This comment has been minimized.

Copy link
Member Author

commented Nov 7, 2016

ok added, thx!

Jenkins build this please.

@MartijnKaijser MartijnKaijser merged commit a518ebe into xbmc:master Nov 7, 2016

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins4kodi You did a great job. Have a cookie.
Details

@ronie ronie deleted the ronie:privacypolicy branch Jan 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.