From c09a7bcc4a090938946128afaf624febd199ccc8 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 31 May 2020 18:34:22 +0200 Subject: [PATCH] Add pouetitfromci --- .gitlab-ci.yml | 2 +- .../app/fedilab/nitterizeme/activities/AboutActivity.java | 2 +- .../app/fedilab/nitterizeme/activities/InstanceActivity.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea0123d..5543116 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ pouet-it: # Make the project name first letter uppercase - export NC_DOWNLOAD_URL="${NC_SHARE_URL}?path=%2F${CI_COMMIT_TAG}%2F" - export project="$(tr '[:lower:]' '[:upper:]' <<< ${CI_PROJECT_NAME:0:1})${CI_PROJECT_NAME:1}" - - export MESSAGE=$(echo -e "I just released a new version of "'#'"${APP_NAME}!""\n${CI_PROJECT_URL}/tags/${CI_COMMIT_TAG}\nYou can download the apks on ${NC_DOWNLOAD_URL}") + - export MESSAGE=$(echo -e "A new release of "'#'"${APP_NAME} is available!""\n${CI_PROJECT_URL}/tags/${CI_COMMIT_TAG}\nYou can download the apks on ${NC_DOWNLOAD_URL}") - if [[ ! -z $HOST ]]; then carton exec ./pouet-it-from-ci.pl; fi only: - tags diff --git a/app/src/main/java/app/fedilab/nitterizeme/activities/AboutActivity.java b/app/src/main/java/app/fedilab/nitterizeme/activities/AboutActivity.java index 7cf9c7d..fa2818f 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/activities/AboutActivity.java @@ -116,7 +116,7 @@ public class AboutActivity extends AppCompatActivity { Button how_to = findViewById(R.id.how_to); how_to.setOnClickListener(v -> { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://fedilab.app/wiki/nitterizeme/")); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://fedilab.app/wiki/untrackme/")); startActivity(browserIntent); }); diff --git a/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java b/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java index 614aabb..2f270fb 100644 --- a/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java +++ b/app/src/main/java/app/fedilab/nitterizeme/activities/InstanceActivity.java @@ -60,7 +60,7 @@ import static app.fedilab.nitterizeme.activities.MainActivity.SET_NITTER_HOST; public class InstanceActivity extends AppCompatActivity { - private static String list_for_instances = "https://framagit.org/tom79/fedilab_app/-/blob/master/content/nitterizeme_instances/payload_2.json"; + private static String list_for_instances = "https://framagit.org/tom79/fedilab_app/-/blob/master/content/untrackme_instances/payload_2.json"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -83,7 +83,7 @@ public class InstanceActivity extends AppCompatActivity { protected String doInBackground(Void... voids) { HttpsURLConnection httpsURLConnection; try { - String instances_url = "https://fedilab.app/nitterizeme_instances/payload_2.json"; + String instances_url = "https://fedilab.app/untrackme_instances/payload_2.json"; URL url = new URL(instances_url); httpsURLConnection = (HttpsURLConnection) url.openConnection(); httpsURLConnection.setConnectTimeout(10 * 1000);