Skip to content

Commit 6c393bc

Browse files
fix: Increase delay before sending push notification
1 parent bd54a26 commit 6c393bc

2 files changed

Lines changed: 26 additions & 27 deletions

File tree

.github/workflows/release.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,26 @@ jobs:
6767
subject-name: 'Morphe Manager ${{ steps.release.outputs.new_release_git_tag }}'
6868
subject-path: app/build/outputs/apk/release/morphe-manager*.apk
6969

70+
# TODO: Eventually delete this logic
71+
- name: Copy release files to legacy path
72+
if: steps.release.outputs.new_release_published == 'true'
73+
run: |
74+
git config user.name "semantic-release-bot"
75+
git config user.email "semantic-release-bot@martynus.net"
76+
77+
# Make sure we're rebasing onto the latest remote branch
78+
git fetch origin
79+
git rebase origin/${GITHUB_REF_NAME}
80+
81+
cp app-release.json app/app-release.json
82+
cp CHANGELOG.md app/CHANGELOG.md
83+
git add app/app-release.json
84+
git add app/CHANGELOG.md
85+
git commit -m "chore: Update legacy release files"
86+
87+
# Push explicitly to the branch that triggered the workflow
88+
git push origin HEAD:${GITHUB_REF_NAME}
89+
7090
- name: Generate website deploy token
7191
if: steps.release.outputs.new_release_published == 'true'
7292
id: app-token
@@ -90,7 +110,7 @@ jobs:
90110
91111
- name: Wait before sending FCM
92112
if: steps.release.outputs.new_release_published == 'true'
93-
run: sleep 300
113+
run: sleep 480
94114

95115
- name: Setup Python for FCM
96116
if: steps.release.outputs.new_release_published == 'true'

app/src/main/java/app/morphe/manager/util/Constants.kt

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
package app.morphe.manager.util
77

8-
import android.content.Context
98
import androidx.compose.ui.graphics.Color
9+
import app.morphe.manager.util.KnownApps.DEFAULT_COLORS
10+
import app.morphe.manager.util.KnownApps.getAppName
1011

1112
const val tag = "Morphe Manager"
1213

@@ -19,13 +20,13 @@ const val MORPHE_API_URL = "https://api.morphe.software"
1920
* Delay before showing a manager update notification to the user.
2021
* Gives time for the APK to be fully uploaded after app-release.json is published.
2122
*/
22-
const val MANAGER_UPDATE_SHOW_DELAY_SECONDS = 300L
23+
const val MANAGER_UPDATE_SHOW_DELAY_SECONDS = 7 * 60
2324

2425
/** Raw GitHub URL for the stable manager release JSON (main branch) */
25-
const val MANAGER_RELEASE_JSON_URL = "https://raw.githubusercontent.com/MorpheApp/morphe-manager/refs/heads/main/app/app-release.json"
26+
const val MANAGER_RELEASE_JSON_URL = "https://raw.githubusercontent.com/MorpheApp/morphe-manager/refs/heads/main/app-release.json"
2627

2728
/** Raw GitHub URL for the pre-release manager release JSON (dev branch) */
28-
const val MANAGER_PRERELEASE_JSON_URL = "https://raw.githubusercontent.com/MorpheApp/morphe-manager/refs/heads/dev/app/app-release.json"
29+
const val MANAGER_PRERELEASE_JSON_URL = "https://raw.githubusercontent.com/MorpheApp/morphe-manager/refs/heads/dev/app-release.json"
2930

3031
/** Controls whether manager updates are fetched directly from JSON files in the repository instead of using the GitHub API */
3132
const val USE_MANAGER_DIRECT_JSON = true
@@ -102,28 +103,6 @@ object KnownApps {
102103
YOUTUBE to "YouTube",
103104
YOUTUBE_MUSIC to "YouTube Music",
104105
REDDIT to "Reddit",
105-
X_TWITTER to "X",
106-
"com.amazon.avod.thirdpartyclient" to "Amazon Prime Video",
107-
"com.avocards" to "Avocards",
108-
"me.mycake" to "Cake",
109-
"com.crunchyroll.crunchyroid" to "Crunchyroll",
110-
"kr.co.yjteam.dailypay" to "DAILY PAY",
111-
"com.duolingo" to "Duolingo",
112-
"kr.eggbun.eggconvo" to "Eggbun",
113-
"jp.ne.ibis.ibispaintx.app" to "IbisPaint X2",
114-
"org.languageapp.lingory" to "Lingory2",
115-
"com.merriamwebster" to "Merriam-Webster",
116-
"org.totschnig.myexpenses" to "MyExpenses",
117-
"com.myfitnesspal.android" to "MyFitnessPal",
118-
"com.pandora.android" to "Pandora",
119-
"com.bambuna.podcastaddict" to "Podcast Addict",
120-
"ch.protonvpn.android" to "Proton VPN",
121-
"ginlemon.flowerfree" to "Smart Launcher",
122-
"pl.solidexplorer2" to "Solid Explorer",
123-
"net.teuida.teuida" to "Teuida",
124-
"app.ttmikstories.android" to "TTMIK Stories",
125-
"com.qbis.guessthecountry" to "World Map Quiz",
126-
"cn.wps.moffice_eng" to "WPS Office",
127106
)
128107

129108
/**

0 commit comments

Comments
 (0)