Skip to content

Commit

Permalink
Merge pull request ElJaviLuki#15 from Lanchon/client_8.16.0
Browse files Browse the repository at this point in the history 
Bump version to 8.16.0
  • Loading branch information
@ElJaviLuki
ElJaviLuki authored Sep 14, 2022
2 parents 0c8aea4 + 59bdc7d commit 1cd383a
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 40 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/com/eljaviluki/grindrplus/Hooker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Hooker : IXposedHookLoadPackage {
Hooks.hookFeatureGranting()
Hooks.allowScreenshotsHook()
Hooks.unlimitedExpiringPhotos()
Hooks.addExtraProfileFields()
//Hooks.addExtraProfileFields()
Hooks.hookUserSessionImpl()
Hooks.allowMockProvider()
Hooks.allowVideocallsOnEmptyChats()
Expand All @@ -55,7 +55,7 @@ class Hooker : IXposedHookLoadPackage {
}

companion object {
const val TARGET_PKG_VERSION_NAME = "8.11.0"
const val TARGET_PKG_VERSION_NAME = "8.16.0"

var pkgParam: LoadPackageParam by InitOnce()
var appContext: Context by InitOnce()
Expand Down
25 changes: 6 additions & 19 deletions app/src/main/java/com/eljaviluki/grindrplus/Hooks.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Hooks {
* - Profile ID
* - Last seen (exact date and time)
*/
fun addExtraProfileFields() {
fun addExtraProfileFields_DISABLED() {
val class_ProfileFieldsView = findClass(
GApp.ui.profileV2.ProfileFieldsView,
Hooker.pkgParam.classLoader
Expand All @@ -53,7 +53,7 @@ object Hooks {
)

val class_ExtendedProfileFieldView = findClass(
GApp.view.ExtendedProfileFieldView,
null, //GApp.view.ExtendedProfileFieldView,
Hooker.pkgParam.classLoader
)

Expand All @@ -64,7 +64,7 @@ object Hooks {

findAndHookMethod(
class_ProfileFieldsView,
GApp.ui.profileV2.ProfileFieldsView_.setProfile,
null, //GApp.ui.profileV2.ProfileFieldsView_.setProfile,
class_Profile,
object : XC_MethodHook() {
var fieldsViewInstance: Any? = null
Expand All @@ -88,7 +88,7 @@ object Hooks {

val valueColorId = getStaticIntField(
class_R_color,
GApp.R.color_.grindr_pure_white
null, //GApp.R.color_.grindr_pure_white
) //R.color.grindr_pure_white

override fun afterHookedMethod(param: MethodHookParam) {
Expand Down Expand Up @@ -131,14 +131,14 @@ object Hooks {

callMethod(
extendedProfileFieldView,
GApp.view.ExtendedProfileFieldView_.setLabel,
null, //GApp.view.ExtendedProfileFieldView_.setLabel,
label,
labelColorRgb
)

callMethod(
extendedProfileFieldView,
GApp.view.ExtendedProfileFieldView_.setValue,
null, //GApp.view.ExtendedProfileFieldView_.setValue,
value,
valueColorId
)
Expand Down Expand Up @@ -253,12 +253,6 @@ object Hooks {
RETURN_TRUE
)

findAndHookMethod(
class_Feature,
GApp.model.Feature_.isNotGranted,
RETURN_FALSE
)

val class_IUserSession = findClass(
GApp.storage.IUserSession,
Hooker.pkgParam.classLoader
Expand All @@ -270,13 +264,6 @@ object Hooks {
class_IUserSession,
RETURN_TRUE
)

findAndHookMethod(
class_Feature,
GApp.model.Feature_.isNotGranted,
class_IUserSession,
RETURN_FALSE
)
}

/**
Expand Down
39 changes: 20 additions & 19 deletions app/src/main/java/com/eljaviluki/grindrplus/Obfuscation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ object Obfuscation {
private const val _base = Constants.GRINDR_PKG + ".base"

object Experiment {
private const val _experiment = "$_base.g"
private const val _experiment = "$_base.experiment"

const val IExperimentsManager = "$_experiment.b"
const val IExperimentsManager = "$_experiment.c"
}
}

object experiment {
private const val _experiment = Constants.GRINDR_PKG + ".experiment"

const val Experiments = "$_experiment.Experiments"
const val Experiments = "$_experiment.a"
object Experiments_ {
const val uncheckedIsEnabled_expMgr = "a"
const val uncheckedIsEnabled_expMgr = "c"
}
}

Expand All @@ -38,7 +38,6 @@ object Obfuscation {
const val Feature = "$_model.Feature"
object Feature_ {
const val isGranted = "isGranted"
const val isNotGranted = "isNotGranted"
}
}

Expand Down Expand Up @@ -67,28 +66,28 @@ object Obfuscation {
}

object R {
private const val _R = Constants.GRINDR_PKG + ".m"
private const val _R_base = Constants.GRINDR_PKG

const val color = "$_R\$d"
const val color = "$_R_base.h0"
object color_ {
const val grindr_gold_star_gay = "w"
const val grindr_pure_white = "L"
const val grindr_gold_star_gay = "u"
//const val grindr_pure_white = "L" // seems gone
}
}

object storage {
private const val _storage = Constants.GRINDR_PKG + ".storage"

const val UserSession = "$_storage.ai"
const val UserSession2 = "$_storage.aj"
const val UserSession = "$_storage.o0"
const val UserSession2 = "$_storage.p0"

const val IUserSession = "$_storage.IUserSession"
object IUserSession_ {
const val hasFeature_feature = "a"
const val isFree = "i"
const val isNoXtraUpsell = "j"
const val isXtra = "k"
const val isUnlimited = "l"
const val isFree = "j"
const val isNoXtraUpsell = "p"
const val isXtra = "g"
const val isUnlimited = "q"
}
}

Expand All @@ -100,15 +99,15 @@ object Obfuscation {

const val ProfileFieldsView = "$_profileV2.ProfileFieldsView"
object ProfileFieldsView_ {
const val setProfile = "setProfile"
//const val setProfile = "setProfile" // gone
}
}
}

object utils {
private const val _utils = Constants.GRINDR_PKG + ".utils"

const val ProfileUtils = "$_utils.at"
const val ProfileUtils = "$_utils.w0"
object ProfileUtils_ {
const val onlineIndicatorDuration = "b"
}
Expand All @@ -117,18 +116,20 @@ object Obfuscation {
object view {
private const val _view = Constants.GRINDR_PKG + ".view"

/* unused
const val ExtendedProfileFieldView = "$_view.bv"
object ExtendedProfileFieldView_ {
const val setLabel = "a"
const val setValue = "b"
}
*/

const val TapsAnimLayout = "$_view.TapsAnimLayout"
object TapsAnimLayout_ {
const val tapType = "g"
const val tapType = "h"

const val getCanSelectVariants = "getCanSelectVariants"
const val setTapType = "a"
const val setTapType = "S"
}
}
}
Expand Down

0 comments on commit 1cd383a

Please sign in to comment.