Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8d7fac17 authored by Arnau Mora's avatar Arnau Mora Committed by GitHub
Browse files

Added privacy policy link (#147)



* Added privacy policy link

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

* Changed to lower case

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

* Renamed function

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

* Renamed function

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

* Moved privacy policy url into a constant

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

* Added `UriUtils`

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>

---------

Signed-off-by: default avatarArnau Mora <arnyminer.z@gmail.com>
parent b0f8994a
Loading
Loading
Loading
Loading
+35 −0
Original line number Diff line number Diff line
package at.bitfire.icsdroid

import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.widget.Toast

object UriUtils {
    /**
     * Starts the [Intent.ACTION_VIEW] intent with the given URL, if possible.
     * If the intent can't be resolved (for instance, because there is no browser
     * installed), this method does nothing.
     *
     * @param toastInstallBrowser whether to show "Please install a browser" toast when
     * the Intent could not be resolved
     *
     * @return true on success, false if the Intent could not be resolved (for instance, because
     * there is no user agent installed)
     */
    fun launchUri(context: Context, uri: Uri, action: String = Intent.ACTION_VIEW, toastInstallBrowser: Boolean = true): Boolean {
        val intent = Intent(action, uri)
        try {
            context.startActivity(intent)
            return true
        } catch (e: ActivityNotFoundException) {
            // no browser available
        }

        if (toastInstallBrowser)
            Toast.makeText(context, R.string.install_browser, Toast.LENGTH_LONG).show()

        return false
    }
}
 No newline at end of file
+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import android.annotation.SuppressLint
import android.app.Application
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.PowerManager
@@ -44,6 +45,8 @@ class CalendarListActivity: AppCompatActivity(), SwipeRefreshLayout.OnRefreshLis
         * Set this extra to request calendar permission when the activity starts.
         */
        const val EXTRA_REQUEST_CALENDAR_PERMISSION = "permission"

        const val PRIVACY_POLICY_URL = "https://icsx5.bitfire.at/privacy/"
    }

    private val model by viewModels<SubscriptionsModel>()
@@ -211,6 +214,10 @@ class CalendarListActivity: AppCompatActivity(), SwipeRefreshLayout.OnRefreshLis
        )
    }

    fun onShowPrivacyPolicy(item: MenuItem) {
        UriUtils.launchUri(this, Uri.parse(PRIVACY_POLICY_URL))
    }


    class SubscriptionListAdapter(
        val context: Context
+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@
          android:onClick="onToggleDarkMode"
          app:showAsAction="never" />

    <item android:id="@+id/privacy_policy"
          android:title="@string/calendar_list_privacy_policy"
          android:onClick="onShowPrivacyPolicy"
          app:showAsAction="never"/>

    <item android:title="@string/calendar_list_info"
          android:onClick="onShowInfo"
          app:showAsAction="never"/>
+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@
    <string name="notification_channel_sync_problem">Sync problems</string>
    <string name="permissions_required">Permissions required</string>
    <string name="permissions_grant">Grant</string>
    <string name="install_browser">Please install a Web browser</string>

    <!-- CalendarListActivity -->
    <string name="title_activity_calendar_list">My subscriptions</string>
@@ -25,6 +26,7 @@
    <string name="calendar_list_battery_whitelist_settings">Settings</string>
    <!-- settings, currently in CalendarListActivity -->
    <string name="settings_force_dark_theme">Force dark theme</string>
    <string name="calendar_list_privacy_policy">Privacy policy</string>

    <!-- AddCalendarActivity -->
    <string name="activity_add_calendar">Subscribe to calendar</string>