From ddd6338ae2d8e815ce29494021757c595ab7f61e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Thu, 5 Aug 2021 11:40:26 -0400 Subject: [PATCH] Rename almost all dogbin references to just generic "uploader" --- app/src/main/AndroidManifest.xml | 2 +- .../scoop/core/receiver/CrashReceiver.java | 20 +++++++++--------- .../taco/scoop/core/receiver/ShareReceiver.kt | 2 +- .../UploaderException.kt} | 4 ++-- .../UploaderService.kt} | 12 +++++------ .../UploaderUtils.kt} | 21 ++++++++++--------- app/src/main/java/taco/scoop/util/Intents.kt | 2 +- app/src/main/res/values-de/strings.xml | 10 ++++----- app/src/main/res/values-ja/strings.xml | 10 ++++----- app/src/main/res/values-pt-rBR/strings.xml | 10 ++++----- app/src/main/res/values/strings.xml | 10 ++++----- 11 files changed, 52 insertions(+), 51 deletions(-) rename app/src/main/java/taco/scoop/core/service/{dogbin/DogbinException.kt => uploader/UploaderException.kt} (86%) rename app/src/main/java/taco/scoop/core/service/{dogbin/DogbinUploadService.kt => uploader/UploaderService.kt} (87%) rename app/src/main/java/taco/scoop/core/service/{dogbin/DogbinUtils.kt => uploader/UploaderUtils.kt} (84%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a0d657..6b56d9f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -107,7 +107,7 @@ android:enabled="true" android:process=":crashDetectorService" /> diff --git a/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.java b/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.java index 96b0431..d859b9f 100644 --- a/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.java +++ b/app/src/main/java/taco/scoop/core/receiver/CrashReceiver.java @@ -20,7 +20,7 @@ import taco.scoop.ScoopApplication; import taco.scoop.core.data.crash.Crash; import taco.scoop.core.data.crash.CrashLoader; -import taco.scoop.core.service.dogbin.DogbinUploadService; +import taco.scoop.core.service.uploader.UploaderService; import taco.scoop.ui.activity.DetailActivity; import taco.scoop.ui.activity.MainActivity; import taco.scoop.util.Intents; @@ -42,7 +42,7 @@ public void onReceive(Context context, Intent broadcastIntent) { boolean update = broadcastIntent.getBooleanExtra(Intents.INTENT_UPDATE, false); boolean hideUpload = broadcastIntent.getBooleanExtra(Intents.INTENT_HIDE_UPLOAD, false); boolean uploadError = broadcastIntent.getBooleanExtra(Intents.INTENT_UPLOAD_ERROR, false); - String dogbinLink = broadcastIntent.getStringExtra(Intents.INTENT_DOGBIN_LINK); + String uploaderLink = broadcastIntent.getStringExtra(Intents.INTENT_UPLOADER_LINK); if (description.startsWith(ThreadDeath.class.getName()) && PreferenceHelper.ignoreThreadDeath()) return; @@ -122,25 +122,25 @@ public void onReceive(Context context, Intent broadcastIntent) { builder.addAction(new NotificationCompat.Action(R.drawable.ic_share, context.getString(R.string.action_share), sharePendingIntent)); - if (dogbinLink != null) { + if (uploaderLink != null) { Intent copyLinkIntent = new Intent(context, ShareReceiver.class) .putExtra("pkg", packageName) - .putExtra(Intents.INTENT_DOGBIN_LINK, dogbinLink) + .putExtra(Intents.INTENT_UPLOADER_LINK, uploaderLink) .setAction(Intents.INTENT_ACTION_COPY_LINK); PendingIntent copyLinkPendingIntent = PendingIntent.getBroadcast(context, notificationId, copyLinkIntent, PendingIntent.FLAG_UPDATE_CURRENT); builder.addAction(new NotificationCompat.Action(0, - context.getString(R.string.action_dogbin_copy_link), copyLinkPendingIntent)); + context.getString(R.string.action_uploader_copy_link), copyLinkPendingIntent)); } else if (!hideUpload) { - int uploadTitle = uploadError ? R.string.action_dogbin_upload_error : R.string.action_dogbin_upload; - Intent dogbinIntent = new Intent(context, DogbinUploadService.class) + int uploadTitle = uploadError ? R.string.action_uploader_upload_error : R.string.action_uploader_upload; + Intent uploaderIntent = new Intent(context, UploaderService.class) .putExtra("data", broadcastIntent) .putExtra("crash", crash); - PendingIntent dogbinPendingIntent = PendingIntent.getService(context, - notificationId, dogbinIntent, PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent uploaderPendingIntent = PendingIntent.getService(context, + notificationId, uploaderIntent, PendingIntent.FLAG_UPDATE_CURRENT); builder.addAction(new NotificationCompat.Action(0, - context.getString(uploadTitle), dogbinPendingIntent)); + context.getString(uploadTitle), uploaderPendingIntent)); } else { builder.setProgress(0, 0, true); diff --git a/app/src/main/java/taco/scoop/core/receiver/ShareReceiver.kt b/app/src/main/java/taco/scoop/core/receiver/ShareReceiver.kt index d95c71b..89e7c20 100644 --- a/app/src/main/java/taco/scoop/core/receiver/ShareReceiver.kt +++ b/app/src/main/java/taco/scoop/core/receiver/ShareReceiver.kt @@ -30,7 +30,7 @@ class ShareReceiver : BroadcastReceiver() { context.copyTextToClipboard( R.string.copy_link_label, pkg, - intent.getStringExtra(Intents.INTENT_DOGBIN_LINK) + intent.getStringExtra(Intents.INTENT_UPLOADER_LINK) ) context.displayToast(R.string.copied_link_toast) } diff --git a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinException.kt b/app/src/main/java/taco/scoop/core/service/uploader/UploaderException.kt similarity index 86% rename from app/src/main/java/taco/scoop/core/service/dogbin/DogbinException.kt rename to app/src/main/java/taco/scoop/core/service/uploader/UploaderException.kt index 220d5af..4725252 100644 --- a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinException.kt +++ b/app/src/main/java/taco/scoop/core/service/uploader/UploaderException.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package taco.scoop.core.service.dogbin +package taco.scoop.core.service.uploader -class DogbinException(message: String?) : Exception(message) { +class UploaderException(message: String?) : Exception(message) { companion object { private const val serialVersionUID = 666L } diff --git a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinUploadService.kt b/app/src/main/java/taco/scoop/core/service/uploader/UploaderService.kt similarity index 87% rename from app/src/main/java/taco/scoop/core/service/dogbin/DogbinUploadService.kt rename to app/src/main/java/taco/scoop/core/service/uploader/UploaderService.kt index fd4d4d0..aa5bbca 100644 --- a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinUploadService.kt +++ b/app/src/main/java/taco/scoop/core/service/uploader/UploaderService.kt @@ -1,4 +1,4 @@ -package taco.scoop.core.service.dogbin +package taco.scoop.core.service.uploader import android.app.Service import android.content.Intent @@ -11,7 +11,7 @@ import taco.scoop.core.data.crash.Crash import taco.scoop.util.Intents import java.util.* -class DogbinUploadService : Service() { +class UploaderService : Service() { private var uploadStarted = false private val uploadQueue: Queue = LinkedList() @@ -42,12 +42,12 @@ class DogbinUploadService : Service() { if (data == null) { stopSelf() } else { - DogbinUtils.upload( + UploaderUtils.upload( data.getStringExtra(Intents.INTENT_STACKTRACE), - object : DogbinUtils.UploadResultCallback { + object : UploaderUtils.UploadResultCallback { override fun onSuccess(url: String) { - data.putExtra(Intents.INTENT_DOGBIN_LINK, url) + data.putExtra(Intents.INTENT_UPLOADER_LINK, url) next() } @@ -72,7 +72,7 @@ class DogbinUploadService : Service() { startForeground( 101, NotificationCompat.Builder(this, "status") .setSmallIcon(R.drawable.ic_bug_report) - .setContentTitle(getString(R.string.dogbin_uploading)) + .setContentTitle(getString(R.string.uploader_uploading)) .setColor(ContextCompat.getColor(this, R.color.colorAccent)) .setPriority(NotificationCompat.PRIORITY_MIN) .build() diff --git a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinUtils.kt b/app/src/main/java/taco/scoop/core/service/uploader/UploaderUtils.kt similarity index 84% rename from app/src/main/java/taco/scoop/core/service/dogbin/DogbinUtils.kt rename to app/src/main/java/taco/scoop/core/service/uploader/UploaderUtils.kt index ba13cc8..a7ddbd3 100644 --- a/app/src/main/java/taco/scoop/core/service/dogbin/DogbinUtils.kt +++ b/app/src/main/java/taco/scoop/core/service/uploader/UploaderUtils.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package taco.scoop.core.service.dogbin +package taco.scoop.core.service.uploader import android.os.Handler import android.os.HandlerThread @@ -24,16 +24,17 @@ import java.nio.charset.StandardCharsets import javax.net.ssl.HttpsURLConnection /** - * Helper functions for uploading to del.dog + * Helper functions for uploading to a pastebin-like service, preferably one forked from + * the now-nonfunctional "del.dog" service. */ -object DogbinUtils { - private const val TAG = "DogbinUtils" +object UploaderUtils { + private const val TAG = "UploaderUtils" private const val BASE_URL = "https://del.dog" private val API_URL = String.format("%s/documents", BASE_URL) private var handler: Handler? = null get() { if (field == null) { - val handlerThread = HandlerThread("dogbinThread") + val handlerThread = HandlerThread("uploaderThread") if (!handlerThread.isAlive) { handlerThread.start() } @@ -43,9 +44,9 @@ object DogbinUtils { } /** - * Uploads `content` to dogbin + * Uploads `content` to the service * - * @param content the content to upload to dogbin + * @param content the content to upload * @param callback the callback to call on success / failure */ fun upload(content: String?, callback: UploadResultCallback) { @@ -80,14 +81,14 @@ object DogbinUtils { if (key.isNotEmpty()) { callback.onSuccess(getUrl(key)) } else { - val msg = "Failed to upload to dogbin: No key retrieved" - callback.onFail(msg, DogbinException(msg)) + val msg = "Failed to upload: No key retrieved" + callback.onFail(msg, UploaderException(msg)) } } finally { urlConnection.disconnect() } } catch (e: Exception) { - callback.onFail("Failed to upload to dogbin", e) + callback.onFail("Failed to upload", e) } } } diff --git a/app/src/main/java/taco/scoop/util/Intents.kt b/app/src/main/java/taco/scoop/util/Intents.kt index 0226835..de5c2b5 100644 --- a/app/src/main/java/taco/scoop/util/Intents.kt +++ b/app/src/main/java/taco/scoop/util/Intents.kt @@ -13,5 +13,5 @@ object Intents { const val INTENT_UPDATE = "update" const val INTENT_HIDE_UPLOAD = "hideUpload" const val INTENT_UPLOAD_ERROR = "uploadError" - const val INTENT_DOGBIN_LINK = "dogbinLink" + const val INTENT_UPLOADER_LINK = "uploaderLink" } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f5e76f1..bfdffd3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -89,9 +89,9 @@ Monitoring app crashes Stop - - Upload in progress… - Upload to dogbin - Upload failed - Copy link + + Upload in progress… + Upload to dogbin + Upload failed + Copy link diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 38a5a82..c66a3ca 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -89,9 +89,9 @@ アプリのクラッシュを監視中 停止 - - アップロード中… - dogbinにアップロード - アップロード失敗 - リンクをコピー + + アップロード中… + dogbinにアップロード + アップロード失敗 + リンクをコピー diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8681a8e..2826aea 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -89,9 +89,9 @@ Monitoring app crashes Stop - - Upload in progress… - Upload to dogbin - Upload failed - Copy link + + Upload in progress… + Upload to dogbin + Upload failed + Copy link diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ccda3c..7b455b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,9 +89,9 @@ Monitoring app crashes Stop - - Upload in progress… - Upload to dogbin - Upload failed - Copy link + + Upload in progress… + Upload to dogbin + Upload failed + Copy link