Skip to content

Commit 1980eff

Browse files
committed
Fix release proguard. Allow select cards while anonymous in new deck.
1 parent 9d13b6b commit 1980eff

File tree

7 files changed

+15
-12
lines changed

7 files changed

+15
-12
lines changed

app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ android {
1111
'LICENSE.txt', 'NOTICE.txt', 'README.txt', '.readme']
1212
defaultConfig {
1313
applicationId "com.ediposouza.teslesgendstracker"
14-
minSdkVersion prepareRelease ? 16 : 21
14+
minSdkVersion prepareToRelease ? 16 : 21
1515
targetSdkVersion 25
1616
versionCode appVersionCode
1717
versionName appVersionName
1818
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1919

2020
buildConfigField("boolean", "ENABLE_LOGS_IN_RELEASE", "false")
21+
buildConfigField("boolean", "PREPARE_TO_RELEASE", "$prepareToRelease")
2122
buildConfigField("String", "MIXPANEL_TOKEN", '"eb99af1dad563cbaaf02f008b28e321f"')
2223
buildConfigField("String", "GCM_SENDER", '"597127048287"')
2324
vectorDrawables.useSupportLibrary true
@@ -58,7 +59,7 @@ ext {
5859
icePickVersion = "3.2.+"
5960
okIOVersion = "1.10.+"
6061
okHttpVersion = "3.4.+"
61-
playServicesVersion = prepareRelease ? "10.0.1" : "9.8.0"
62+
playServicesVersion = prepareToRelease ? "10.0.1" : "9.8.0"
6263
supportLibraryVersion = "25.1.0"
6364
threetenabpVersion = "1.0.+"
6465

app/proguard-rules.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#}
1818

1919
## TES Legends Tracker
20-
-keepclassmembers class com.ediposouza.teslesgendstracker.interactor.FirebaseParsers.*Parser { *; }
20+
-keepclassmembers class com.ediposouza.teslesgendstracker.interactor.FirebaseParsers$* { *; }
2121

2222
## Kotlin
2323
-dontwarn kotlin.**

app/src/main/kotlin/com/ediposouza/teslesgendstracker/App.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class App : Application() {
3737
}
3838

3939
private fun initializeDependencies() {
40+
Timber.plant(LoggerManager())
4041
MetricsManager.initialize(this)
4142
AndroidThreeTen.init(this)
4243
FirebaseDatabase.getInstance().apply {
@@ -47,7 +48,6 @@ class App : Application() {
4748
reference.child(BaseInteractor.NODE_PATCHES).keepSynced(sync)
4849
}
4950
}
50-
Timber.plant(LoggerManager())
5151
}
5252

5353
}

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/DecksFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class DecksFragment : BaseFragment(), SearchView.OnQueryTextListener {
117117
val anim = ActivityOptionsCompat.makeCustomAnimation(context, R.anim.slide_up, R.anim.slide_down)
118118
startActivityForResult(context.intentFor<NewDeckActivity>(), RC_NEW_DECK, anim.toBundle())
119119
}
120-
postDelayed({ show() }, DateUtils.SECOND_IN_MILLIS * 2)
120+
postDelayed({ if (this@DecksFragment.isAdded) show() }, DateUtils.SECOND_IN_MILLIS * 2)
121121
}
122122
}
123123

app/src/main/kotlin/com/ediposouza/teslesgendstracker/ui/decks/new/NewDeckCardsListFragment.kt

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class NewDeckCardsListFragment : CardsAllFragment() {
3636

3737
override fun configRecycleView() {
3838
super.configRecycleView()
39-
configLoggedViews()
4039
isFragmentSelected = true
4140
cards_recycler_view.setPadding(0, 0, 0, 0)
4241
}

app/src/release/java/com/ediposouza/teslesgendstracker/util/MetricsManager.kt

+8-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ import android.os.Bundle
55
import com.crashlytics.android.Crashlytics
66
import com.crashlytics.android.answers.*
77
import com.ediposouza.teslesgendstracker.BuildConfig
8-
import com.ediposouza.teslesgendstracker.util.MetricAction
9-
import com.ediposouza.teslesgendstracker.util.MetricScreen
10-
import com.ediposouza.teslesgendstracker.util.MetricsConstants
118
import com.ediposouza.teslesgendstracker.data.Card
129
import com.google.firebase.analytics.FirebaseAnalytics
1310
import com.google.firebase.auth.FirebaseUser
1411
import com.google.firebase.crash.FirebaseCrash
1512
import com.mixpanel.android.mpmetrics.MixpanelAPI
1613
import io.fabric.sdk.android.Fabric
14+
import timber.log.Timber
1715

1816
/**
1917
* Created by ediposouza on 08/12/16.
@@ -25,7 +23,12 @@ object MetricsManager : MetricsConstants() {
2523
var mixpanelAnalytics: MixpanelAPI? = null
2624

2725
fun initialize(context: Context) {
28-
Fabric.with(context, Answers(), Crashlytics())
26+
if (BuildConfig.PREPARE_TO_RELEASE) {
27+
Fabric.with(context, Answers(), Crashlytics())
28+
} else {
29+
Fabric.with(context, Answers())
30+
Timber.w("Crashlytics not initialized")
31+
}
2932
answers = Answers.getInstance()
3033
firebaseAnalytics = FirebaseAnalytics.getInstance(context)
3134
mixpanelAnalytics = MixpanelAPI.getInstance(context, BuildConfig.MIXPANEL_TOKEN)
@@ -82,7 +85,7 @@ object MetricsManager : MetricsConstants() {
8285

8386
private fun identifyUser(user: FirebaseUser?) {
8487
val userId = user?.uid
85-
if (Fabric.isInitialized()) {
88+
if (Fabric.isInitialized() && BuildConfig.PREPARE_TO_RELEASE) {
8689
Crashlytics.setUserIdentifier(userId)
8790
Crashlytics.setUserName(user?.displayName)
8891
Crashlytics.setUserEmail(user?.email)

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
appVersionCode = 3
77

88
kotlin_version = "1.0.6"
9-
prepareRelease = false
9+
prepareToRelease = false
1010
}
1111

1212
repositories {

0 commit comments

Comments
 (0)