From 7c552c51624db11125e3c59a4ecd0e141c806d35 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 30 Apr 2019 13:39:00 +0200 Subject: [PATCH] Remove instabug --- Habitica/build.gradle | 1 - Habitica/proguard-rules.pro | 1 - .../res/drawable/ic_close_grey_800_24dp.xml | 4 + .../res/layout/activity_report_message.xml | 2 +- .../habitica/HabiticaBaseApplication.kt | 21 --- .../habitica/helpers/QrCodeManager.java | 155 ------------------ .../habitica/ui/activities/BaseActivity.kt | 7 - habitica.resources.example | 1 - 8 files changed, 5 insertions(+), 187 deletions(-) create mode 100644 Habitica/res/drawable/ic_close_grey_800_24dp.xml delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java diff --git a/Habitica/build.gradle b/Habitica/build.gradle index b4037fc01..e753c5bdd 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -95,7 +95,6 @@ dependencies { //Analytics implementation 'com.amplitude:android-sdk:2.22.1' - implementation 'com.instabug.library:instabug:8.0.11' // Fresco Image Management Library implementation('com.facebook.fresco:fresco:1.13.0') { exclude module: 'bolts-android' diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro index fc479c339..be01fddca 100644 --- a/Habitica/proguard-rules.pro +++ b/Habitica/proguard-rules.pro @@ -179,4 +179,3 @@ #-ignorewarnings -keep class com.google.firebase.provider.FirebaseInitProvider --keep class com.example.instabug.** diff --git a/Habitica/res/drawable/ic_close_grey_800_24dp.xml b/Habitica/res/drawable/ic_close_grey_800_24dp.xml new file mode 100644 index 000000000..92be09495 --- /dev/null +++ b/Habitica/res/drawable/ic_close_grey_800_24dp.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml index 6d6383046..8d00d3f6f 100644 --- a/Habitica/res/layout/activity_report_message.xml +++ b/Habitica/res/layout/activity_report_message.xml @@ -46,7 +46,7 @@ android:id="@+id/close_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_close" + android:src="@drawable/ic_close_grey_800_24dp" android:background="@color/transparent" android:paddingLeft="@dimen/spacing_small"/> { - File dir = getAlbumStorageDir(context, albumnName); - dir.mkdirs(); - - File pathToQRCode = new File(dir, fileName); - try { - pathToQRCode.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - - try { - FileOutputStream outputStream = new FileOutputStream(pathToQRCode); - qrCodeWrapper.setDrawingCacheEnabled(true); - Bitmap b = qrCodeWrapper.getDrawingCache(); - b.compress(Bitmap.CompressFormat.JPEG, 95, outputStream); - - outputStream.close(); - - Toast.makeText(context, saveMessage + pathToQRCode.getPath(), - Toast.LENGTH_LONG).show(); - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - - private File getAlbumStorageDir(Context context, String albumName) { - // Get the directory for the app's private pictures directory. - File file = new File(context.getExternalFilesDir( - Environment.DIRECTORY_PICTURES), albumName); - file.mkdirs(); - return file; - } - - public void showDialogue() { - final Dialog dialog = new Dialog(context); - dialog.setContentView(R.layout.qr_dialogue); - dialog.setTitle(R.string.qr_dialogue_title); - - LinearLayout qrLayout = dialog.findViewById(R.id.qrLayout); - this.setUpView(qrLayout); - Button dialogButton = dialog.findViewById(R.id.dialogButtonOK); - - dialogButton.setOnClickListener(v -> dialog.dismiss()); - - dialog.show(); - } -} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt index 78084dc7d..6421241f7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.activities import android.os.Bundle -import android.view.MotionEvent import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar @@ -10,7 +9,6 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.components.AppComponent import com.habitrpg.android.habitica.events.ShowConnectionProblemEvent -import com.instabug.library.InstabugTrackingDelegate import io.reactivex.disposables.CompositeDisposable import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -29,11 +27,6 @@ abstract class BaseActivity : AppCompatActivity() { var isActivityVisible = false - override fun dispatchTouchEvent(ev: MotionEvent): Boolean { - InstabugTrackingDelegate.notifyActivityGotTouchEvent(ev, this) - return super.dispatchTouchEvent(ev) - } - override fun isDestroyed(): Boolean { return destroyed } diff --git a/habitica.resources.example b/habitica.resources.example index 4e56df8fe..98f80f458 100644 --- a/habitica.resources.example +++ b/habitica.resources.example @@ -4,4 +4,3 @@ amplitude_app_id=CHANGE_ME seeds_app_key=CHANGE_ME seeds_interstitial_gems=CHANGE_ME seeds_interstitial_sharing=CHANGE_ME -instabug_key=CHANGE_ME