From b95bb92d849ed9a655269bc0aad179595fd9eafd Mon Sep 17 00:00:00 2001 From: devgianlu Date: Wed, 18 Oct 2023 13:47:54 +0200 Subject: [PATCH] Upgrade CommonUtils --- CommonUtils | 2 +- app/src/main/java/com/gianlu/timeless/LoadingActivity.java | 4 ++-- app/src/main/java/com/gianlu/timeless/MainActivity.java | 2 +- .../main/java/com/gianlu/timeless/PreferenceActivity.java | 6 ++++++ app/src/main/java/com/gianlu/timeless/ThisApplication.java | 7 +++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CommonUtils b/CommonUtils index 36cbb597..ac69ff78 160000 --- a/CommonUtils +++ b/CommonUtils @@ -1 +1 @@ -Subproject commit 36cbb597cbd9b643cbba9cc9d7e0fb3bb2ca6559 +Subproject commit ac69ff78cc21ad45e3709f85460ef115e8e12fd7 diff --git a/app/src/main/java/com/gianlu/timeless/LoadingActivity.java b/app/src/main/java/com/gianlu/timeless/LoadingActivity.java index 0c3ba293..89d30af6 100644 --- a/app/src/main/java/com/gianlu/timeless/LoadingActivity.java +++ b/app/src/main/java/com/gianlu/timeless/LoadingActivity.java @@ -56,7 +56,7 @@ public void goodToGo() { @Override public void offline() { - view.endFakeAnimation(() -> OfflineActivity.startActivity(LoadingActivity.this, LoadingActivity.class), false); + view.endFakeAnimation(() -> OfflineActivity.startActivity(LoadingActivity.this, "Timeless", LoadingActivity.class), false); } }); } @@ -92,7 +92,7 @@ public void onException(@NonNull Exception ex) { view.endFakeAnimation(() -> { Toaster.with(this).message(R.string.failedRefreshingToken).show(); if (ex instanceof IOException) { - OfflineActivity.startActivity(this, LoadingActivity.class); + OfflineActivity.startActivity(this, "Timeless", LoadingActivity.class); } else if (ex instanceof WakaTime.MissingCredentialsException) { start(GrantActivity.class, null); } diff --git a/app/src/main/java/com/gianlu/timeless/MainActivity.java b/app/src/main/java/com/gianlu/timeless/MainActivity.java index 3d52f205..6ef784a7 100644 --- a/app/src/main/java/com/gianlu/timeless/MainActivity.java +++ b/app/src/main/java/com/gianlu/timeless/MainActivity.java @@ -138,7 +138,7 @@ public boolean onDrawerMenuItemSelected(@NonNull BaseDrawerItem item startActivity(new Intent(this, PreferenceActivity.class)); return false; case SUPPORT: - LogsHelper.sendEmail(this, null); + LogsHelper.openGithubIssue(this,"Timeless", null); return true; default: return true; diff --git a/app/src/main/java/com/gianlu/timeless/PreferenceActivity.java b/app/src/main/java/com/gianlu/timeless/PreferenceActivity.java index 25b2d72d..152b138c 100644 --- a/app/src/main/java/com/gianlu/timeless/PreferenceActivity.java +++ b/app/src/main/java/com/gianlu/timeless/PreferenceActivity.java @@ -31,6 +31,12 @@ protected boolean hasTutorial() { return false; } + @Nullable + @Override + protected String getGithubProjectName() { + return "Timeless"; + } + @Nullable @Override protected String getOpenSourceUrl() { diff --git a/app/src/main/java/com/gianlu/timeless/ThisApplication.java b/app/src/main/java/com/gianlu/timeless/ThisApplication.java index f14e87db..654c2992 100644 --- a/app/src/main/java/com/gianlu/timeless/ThisApplication.java +++ b/app/src/main/java/com/gianlu/timeless/ThisApplication.java @@ -3,6 +3,7 @@ import android.preference.PreferenceManager; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.gianlu.commonutils.analytics.AnalyticsApplication; import com.gianlu.commonutils.network.ConnectivityChecker; @@ -58,4 +59,10 @@ protected boolean uncaughtNotDebug(Thread thread, Throwable throwable) { protected boolean isDebug() { return BuildConfig.DEBUG; } + + @Nullable + @Override + protected String getGithubProjectName() { + return "Timeless"; + } }