Skip to content

Commit

Permalink
Add privacy policies page & consent
Browse files Browse the repository at this point in the history
  • Loading branch information
nico2che committed Apr 24, 2019
1 parent e2bf054 commit e3e0cae
Show file tree
Hide file tree
Showing 18 changed files with 210 additions and 119 deletions.
12 changes: 1 addition & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,7 @@ local.properties
.signing/

# User-specific configurations
.idea/libraries/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
.idea
*.iml

# OS-specific files
Expand Down
Binary file removed .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file removed .idea/caches/gradle_models.ser
Binary file not shown.
21 changes: 0 additions & 21 deletions .idea/gradle.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

7 changes: 4 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.aerophile.app"
minSdkVersion 15
targetSdkVersion 28
versionCode 39
versionName "1.8.2"
versionCode 42
versionName "1.8.4"
}
buildTypes {
release {
Expand Down Expand Up @@ -58,6 +58,7 @@ def AAVersion = '4.6.0'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.android.support.constraint:constraint-layout:1.1.3'
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
implementation "org.androidannotations:androidannotations-api:$AAVersion"
annotationProcessor "org.androidannotations:rest-spring:$AAVersion"
Expand All @@ -79,4 +80,4 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.2'
}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
103 changes: 51 additions & 52 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.aerophile.app"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.aerophile.app">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application
android:allowBackup="true"
android:icon="@drawable/aerophile_icon"
android:label="@string/aerophile"
android:theme="@style/Theme.AppCompat.Light">
<activity
android:name=".LauncherActivity_"
android:label="@string/aerophile"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".AccueilActivity_"
android:label="@string/aerophile"
android:noHistory="true"
android:windowSoftInputMode="adjustPan">
</activity>
<activity
android:name=".ReglagesActivity_"
android:label="@string/reglages_titre"
android:noHistory="true">
</activity>
<activity
android:name=".DemarrageActivity_"
android:label="@string/title_activity_demarrage">
</activity>
<activity
android:name=".VolListActivity_"
android:label="@string/aerophile"
android:windowSoftInputMode="adjustPan">
</activity>
<activity
android:name=".EnvoieActivity_"
android:label="@string/title_activity_envoie"
android:parentActivityName=".VolListActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.aerophile.app.VolListActivity"/>
</activity>
<activity android:name=".PdfActivity_">
</activity>
<activity android:name=".ApercuActivity_">
</activity>
<application
android:allowBackup="true"
android:icon="@drawable/aerophile_icon"
android:label="@string/aerophile"
android:theme="@style/Theme.AppCompat.Light">
<activity
android:name=".PrivacyActivity_"
android:label="@string/privacy"
android:theme="@style/NoActionBar"></activity>
<activity
android:name=".LauncherActivity_"
android:label="@string/aerophile"
android:noHistory="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".AccueilActivity_"
android:label="@string/aerophile"
android:noHistory="true"
android:windowSoftInputMode="adjustPan"></activity>
<activity
android:name=".ReglagesActivity_"
android:label="@string/reglages_titre"
android:noHistory="true"></activity>
<activity
android:name=".DemarrageActivity_"
android:label="@string/title_activity_demarrage"></activity>
<activity
android:name=".VolListActivity_"
android:label="@string/aerophile"
android:windowSoftInputMode="adjustPan"></activity>
<activity
android:name=".EnvoieActivity_"
android:label="@string/title_activity_envoie"
android:parentActivityName=".VolListActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.aerophile.app.VolListActivity" />
</activity>
<activity android:name=".PdfActivity_"></activity>
<activity android:name=".ApercuActivity_"></activity>
</application>

</manifest>
</manifest>
62 changes: 62 additions & 0 deletions app/src/main/assets/privacy.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<!-- saved from url=(0045)https://fev.aerophile.com/privacy_policy.html -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

<meta name="viewport" content="width=device-width">
<title>Privacy Policy</title>
<style> body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; padding:1em; } </style>
</head>
<body>
<h2>Privacy Policy</h2> <p> Aérophile built the Aérophile app as a Free app. This SERVICE is provided by
Aérophile at no cost and is intended for use as is.
</p> <p>This page is used to inform visitors regarding our policies with the collection, use, and disclosure
of Personal Information if anyone decided to use our Service.
</p> <p>If you choose to use our Service, then you agree to the collection and use of information in
relation to this policy. The Personal Information that we collect is used for providing and improving
the Service. We will not use or share your information with anyone except as described
in this Privacy Policy.
</p> <p>The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is
accessible at Aérophile unless otherwise defined in this Privacy Policy.
</p> <p><strong>Information Collection and Use</strong></p> <p>For a better experience, while using our Service, we may require you to provide us with certain
personally identifiable information, including but not limited to Android advertising identifier. The information that we request will be retained by us and used as described in this privacy policy.
</p> <p>The app does use third party services that may collect information used to identify you.</p> <div><p>Link to privacy policy of third party service providers used by the app</p> <ul><li><a href="https://www.google.com/policies/privacy/" target="_blank">Google Play Services</a></li><!----><li><a href="https://firebase.google.com/policies/analytics" target="_blank">Firebase Analytics</a></li><!----><!----><li><a href="http://try.crashlytics.com/terms/privacy-policy.pdf" target="_blank">Crashlytics</a></li><!----><!----><!----></ul></div> <p><strong>Log Data</strong></p> <p> We want to inform you that whenever you use our Service, in a case of
an error in the app we collect data and information (through third party products) on your phone
called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address,
device name, operating system version, the configuration of the app when utilizing our Service,
the time and date of your use of the Service, and other statistics.
</p> <p><strong>Cookies</strong></p> <p>Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers.
These are sent to your browser from the websites that you visit and are stored on your device's internal
memory.
</p> <p>This Service does not use these “cookies” explicitly. However, the app may use third party code and
libraries that use “cookies” to collect information and improve their services. You have the option to
either accept or refuse these cookies and know when a cookie is being sent to your device. If you choose
to refuse our cookies, you may not be able to use some portions of this Service.
</p> <p><strong>Service Providers</strong></p> <p> We may employ third-party companies and individuals due to the following reasons:</p> <ul><li>To facilitate our Service;</li> <li>To provide the Service on our behalf;</li> <li>To perform Service-related services; or</li> <li>To assist us in analyzing how our Service is used.</li></ul> <p> We want to inform users of this Service that these third parties have access to
your Personal Information. The reason is to perform the tasks assigned to them on our behalf. However,
they are obligated not to disclose or use the information for any other purpose.
</p> <p><strong>Security</strong></p> <p> We value your trust in providing us your Personal Information, thus we are striving
to use commercially acceptable means of protecting it. But remember that no method of transmission over
the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee
its absolute security.
</p> <p><strong>Links to Other Sites</strong></p> <p>This Service may contain links to other sites. If you click on a third-party link, you will be directed
to that site. Note that these external sites are not operated by us. Therefore, we strongly
advise you to review the Privacy Policy of these websites. We have no control over
and assume no responsibility for the content, privacy policies, or practices of any third-party sites
or services.
</p> <p><strong>Children’s Privacy</strong></p> <p>These Services do not address anyone under the age of 13. We do not knowingly collect
personally identifiable information from children under 13. In the case we discover that a child
under 13 has provided us with personal information, we immediately delete this from
our servers. If you are a parent or guardian and you are aware that your child has provided us with personal
information, please contact us so that we will be able to do necessary actions.
</p> <p><strong>Changes to This Privacy Policy</strong></p> <p> We may update our Privacy Policy from time to time. Thus, you are advised to review
this page periodically for any changes. We will notify you of any changes by posting
the new Privacy Policy on this page. These changes are effective immediately after they are posted on
this page.
</p> <p><strong>Contact Us</strong></p> <p>If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact
us at dpo@aerophile.com.
</p> <p>This privacy policy page was created at <a href="https://privacypolicytemplate.net/" target="_blank">privacypolicytemplate.net</a>
and modified/generated by <a href="https://app-privacy-policy-generator.firebaseapp.com/" target="_blank">App
Privacy Policy Generator</a></p>


</body></html>
16 changes: 16 additions & 0 deletions app/src/main/java/com/aerophile/app/AccueilActivity.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.aerophile.app;

import android.app.ProgressDialog;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
Expand Down Expand Up @@ -88,4 +91,17 @@ void message(String texte) {
pDialog.dismiss();
Toast.makeText(this, texte, Toast.LENGTH_SHORT).show();
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_accueil, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(final MenuItem item) {
Intent privacyActivity = new Intent(this, PrivacyActivity_.class);
startActivity(privacyActivity);
return true;
}
}
3 changes: 0 additions & 3 deletions app/src/main/java/com/aerophile/app/PdfActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
import android.os.Bundle;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Toast;

import com.aerophile.app.R;

import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
Expand Down
27 changes: 27 additions & 0 deletions app/src/main/java/com/aerophile/app/PrivacyActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.aerophile.app;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.webkit.WebView;

import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewById;

@EActivity(R.layout.activity_privacy)
public class PrivacyActivity extends AppCompatActivity {

@ViewById
WebView webView;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTitle(getString(R.string.privacy));
}

@AfterViews
void initialisation() {
webView.loadUrl("file:///android_asset/privacy.html");
}
}
18 changes: 9 additions & 9 deletions app/src/main/res/layout/activity_accueil.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@
android:layout_marginBottom="30dp" />

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="1"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:orientation="horizontal"
android:weightSum="1">

<EditText
android:layout_height="wrap_content"
android:id="@+id/code"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:inputType="text"
android:nestedScrollingEnabled="false"
android:layout_width="300dp" />
android:nestedScrollingEnabled="false" />

<Button
android:id="@+id/valider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/accueil_valider"
android:layout_marginLeft="15dp"
android:onClick="verificationCode"
android:id="@+id/valider"
android:layout_marginLeft="15dp" />
android:text="@string/accueil_valider" />
</LinearLayout>

</LinearLayout>
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/layout/activity_privacy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.aerophile.app.PrivacyActivity">

<WebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/webView"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"/>

</RelativeLayout>
9 changes: 9 additions & 0 deletions app/src/main/res/menu/menu_accueil.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.aerophile.app.AccueilActivity">
<item android:id="@+id/menu_privacy_action"
android:title="@string/privacy"
app:showAsAction="ifRoom" />
</menu>
Loading

0 comments on commit e3e0cae

Please sign in to comment.