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

Commit d6c494f2 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Merge branch '3708-rebase_on_1.17.8' into 'main' 

Update ntfy from 1.17.8 of upstream

See merge request !16
parents ad05aa27 59cae46d

.gitlab-ci.yml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"



stages:

- build



before_script:

- export GRADLE_USER_HOME=$(pwd)/.gradle

- chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

  - .gradle/



buildRelease:

  stage: build

  script:

    - ./gradlew assembleFdroid

  artifacts:

    paths:

      - app/build/outputs/apk/fdroid/release

app/build.gradle

+8 −3
Original line number Diff line number Diff line
@@ -9,17 +9,22 @@ apply plugin: 'com.android.application' 
apply plugin: 'kotlin-android'

apply plugin: 'com.google.gms.google-services'



def versionMajor = 1

def versionMinor = 17

def versionPatch = 8

def eOSPatch = 1



android {

    namespace "io.heckel.ntfy"

    compileSdkVersion 35



    defaultConfig {

        applicationId "io.heckel.ntfy"

        applicationId "foundation.e.ntfy"

        minSdkVersion 21

        targetSdkVersion 35



        versionCode 41

        versionName "1.17.8"

        versionCode versionMajor * 100000000 + versionMinor * 100000 + versionPatch * 100 + eOSPatch

        versionName "${versionMajor}.${versionMinor}.${versionPatch}-${eOSPatch}"



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools">



    <!-- Permissions -->

    <uses-permission android:name="android.permission.INTERNET"/>
@@ -25,6 +26,7 @@ 
            android:allowBackup="true"

            android:icon="@mipmap/ic_launcher"

            android:label="@string/app_name"

            android:persistent="true"

            android:roundIcon="@mipmap/ic_launcher"

            android:supportsRtl="true"

            android:theme="@style/AppTheme"
@@ -35,10 +37,10 @@ 
        <activity

                android:name=".ui.MainActivity"

                android:label="@string/app_name"

                android:excludeFromRecents="true"

                android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>

app/src/main/java/io/heckel/ntfy/service/SubscriberService.kt

+0 −16
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ import android.app.* 
import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent

import android.content.pm.ServiceInfo

import android.os.Build

import android.os.IBinder

import android.os.PowerManager
@@ -89,21 +88,6 @@ class SubscriberService : Service() { 


        Log.init(this) // Init logs in all entry points

        Log.d(TAG, "Subscriber service has been created")



        val title = getString(R.string.channel_subscriber_notification_title)

        val text = if (BuildConfig.FIREBASE_AVAILABLE) {

            getString(R.string.channel_subscriber_notification_instant_text)

        } else {

            getString(R.string.channel_subscriber_notification_noinstant_text)

        }

        notificationManager = createNotificationChannel()

        serviceNotification = createNotification(title, text)



        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {

            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification!!, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)

        } else {

            startForeground(NOTIFICATION_SERVICE_ID, serviceNotification)

        }

    }



    override fun onDestroy() {

app/src/main/java/io/heckel/ntfy/service/SubscriberServiceManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class SubscriberServiceManager(private val context: Context) { 
                Log.d(TAG, "ServiceStartWorker: Starting foreground service with action $action (work ID: ${id})")

                Intent(context, SubscriberService::class.java).also {

                    it.action = action.name

                    ContextCompat.startForegroundService(context, it)

                    context.startService(it)

                }

            }

            return Result.success()