sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix subscription issues

Browse source
This commit is contained in:
Phillip Thelen 2018-12-18 22:04:39 +01:00
parent 1904c6df3a
commit f31f88da90
9 changed files with 107 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/build.gradle
View file

@ -148,7 +148,7 @@ android {
buildConfigField "String", "STORE", "\"google\""
multiDexEnabled true
versionCode 2046
versionCode 2051
versionName "1.7"
}
@ -175,7 +175,7 @@ android {
}
release {
signingConfig signingConfigs.release
debuggable true
debuggable false
multiDexEnabled true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

7
Habitica/res/layout/drawer_main.xml
View file

@ -61,13 +61,14 @@
android:layout_width="45dp"
android:layout_height="match_parent"
android:layout_marginLeft="16dp">
<ImageButton
<ImageView
android:id="@+id/messagesButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:src="@drawable/menu_messages"
android:layout_centerVertical="true"/>
android:layout_centerVertical="true"
android:clickable="false" />
<TextView
android:id="@+id/messagesBadge"
android:layout_width="wrap_content"
@ -89,7 +90,7 @@
android:layout_width="43dp"
android:layout_height="match_parent"
android:paddingLeft="8dp">
<ImageButton
<ImageView
android:id="@+id/settingsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

34
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
View file

@ -16,6 +16,7 @@ import com.habitrpg.android.habitica.models.responses.ErrorResponse;
import com.playseeds.android.sdk.Seeds;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import org.solovyev.android.checkout.BasePurchaseVerifier;
import org.solovyev.android.checkout.Purchase;
import org.solovyev.android.checkout.RequestListener;
@ -24,6 +25,7 @@ import org.solovyev.android.checkout.ResponseCodes;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -34,17 +36,19 @@ import retrofit2.HttpException;
* Created by Negue on 26.11.2015.
*/
public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
public static Map<String, String> pendingGifts = new HashMap<>();
private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
private static final String PENDING_GIFTS_KEY = "PENDING_GIFTS";
private final ApiClient apiClient;
private Set<String> purchasedOrderList = new HashSet<>();
public static Map<String, String> pendingGifts = new HashMap<>();
private SharedPreferences preferences;
public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
preferences = PreferenceManager.getDefaultSharedPreferences(context);
preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
pendingGifts = loadPendingGifts();
this.apiClient = apiClient;
}
@ -173,5 +177,33 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
SharedPreferences.Editor edit = preferences.edit();
edit.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
edit.apply();
savePendingGifts();
}
private void savePendingGifts(){
JSONObject jsonObject = new JSONObject(pendingGifts);
String jsonString = jsonObject.toString();
SharedPreferences.Editor editor = preferences.edit();
editor.remove(PENDING_GIFTS_KEY).apply();
editor.putString(PENDING_GIFTS_KEY, jsonString);
editor.commit();
}
private Map<String, String> loadPendingGifts() {
Map<String, String> outputMap = new HashMap<>();
try{
String jsonString = preferences.getString(PENDING_GIFTS_KEY, (new JSONObject()).toString());
JSONObject jsonObject = new JSONObject(jsonString);
Iterator<String> keysItr = jsonObject.keys();
while(keysItr.hasNext()) {
String key = keysItr.next();
String value = (String) jsonObject.get(key);
outputMap.put(key, value);
}
}catch(Exception e){
e.printStackTrace();
}
return outputMap;
}
}

17
Habitica/src/main/java/com/habitrpg/android/habitica/api/HostConfig.kt
View file

@ -16,8 +16,8 @@ import com.habitrpg.android.habitica.R
class HostConfig {
var address: String
var port: String
var api: String? = null
var user: String? = null
var api: String
var user: String
constructor(sharedPreferences: SharedPreferences, context: Context) {
val prefs = PreferenceManager.getDefaultSharedPreferences(context)
@ -25,10 +25,15 @@ class HostConfig {
if (BuildConfig.DEBUG) {
this.address = BuildConfig.BASE_URL
} else {
this.address = sharedPreferences.getString("server_url", null) ?: context.getString(R.string.base_url)
val address = sharedPreferences.getString("server_url", null)
if (address != null && address.isNotEmpty()) {
this.address = address
} else {
this.address = context.getString(R.string.base_url)
}
}
this.api = prefs.getString("APIToken", null)
this.user = prefs.getString(context.getString(R.string.SP_userID), "")
this.api = prefs.getString("APIToken", null) ?: ""
this.user = prefs.getString(context.getString(R.string.SP_userID), null) ?: ""
}
constructor(address: String, port: String, api: String, user: String) {
@ -39,7 +44,7 @@ class HostConfig {
}
fun hasAuthentication(): Boolean {
return user?.isNotEmpty() == true && api?.length ?: 0 > 0
return user.isNotEmpty() && api.isNotEmpty()
}
}

6
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
View file

@ -111,7 +111,7 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
.addNetworkInterceptor { chain ->
val original = chain.request()
var builder: Request.Builder = original.newBuilder()
if (this.hostConfig.user != null) {
if (this.hostConfig.hasAuthentication()) {
builder = builder
.header("x-api-key", this.hostConfig.api)
.header("x-api-user", this.hostConfig.user)
@ -279,8 +279,8 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
}
override fun updateAuthenticationCredentials(userID: String?, apiToken: String?) {
this.hostConfig.user = userID
this.hostConfig.api = apiToken
this.hostConfig.user = userID ?: ""
this.hostConfig.api = apiToken ?: ""
crashlyticsProxy.setUserIdentifier(this.hostConfig.user)
crashlyticsProxy.setUserName(this.hostConfig.user)
Amplitude.getInstance().userId = this.hostConfig.user

41
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
View file

@ -60,8 +60,6 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setupCheckout()
Seeds.sharedInstance()
.simpleInit(this, this, "https://dash.playseeds.com", getString(R.string.seeds_app_key)).isLoggingEnabled = true
Seeds.sharedInstance().requestInAppMessage(getString(R.string.seeds_interstitial_gems))
@ -78,11 +76,30 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
setViewPagerAdapter()
compositeSubscription.add(userRepository.getUser().subscribe(Consumer { user ->
for (test in user.abTests ?: emptyList<ABTest>()) {
if (test.name == "subscriptionPageOrder") {
if (test.group == "subscriptionFirst") {
showSubscriptionPageFirst = true
viewPager.adapter?.notifyDataSetChanged()
return@Consumer
}
}
}
showSubscriptionPageFirst = false
viewPager.adapter?.notifyDataSetChanged()
}, RxErrorHandler.handleEmptyError()))
}
override fun onResume() {
super.onResume()
setupCheckout()
activityCheckout?.destroyPurchaseFlow()
activityCheckout?.createPurchaseFlow(object : RequestListener<Purchase> {
override fun onSuccess(purchase: Purchase) {
if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
if (PurchaseTypes.allGemTypes.contains(purchase.sku) || PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku)) {
billingRequests?.consume(purchase.token, object : RequestListener<Any> {
override fun onSuccess(o: Any) {
//EventBus.getDefault().post(new BoughtGemsEvent(GEMS_TO_ADD));
@ -121,25 +138,11 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
override fun onReady(billingRequests: BillingRequests, s: String, b: Boolean) {}
})
compositeSubscription.add(userRepository.getUser().subscribe(Consumer { user ->
for (test in user.abTests ?: emptyList<ABTest>()) {
if (test.name == "subscriptionPageOrder") {
if (test.group == "subscriptionFirst") {
showSubscriptionPageFirst = true
viewPager.adapter?.notifyDataSetChanged()
return@Consumer
}
}
}
showSubscriptionPageFirst = false
viewPager.adapter?.notifyDataSetChanged()
}, RxErrorHandler.handleEmptyError()))
}
public override fun onDestroy() {
public override fun onPause() {
activityCheckout?.stop()
super.onDestroy()
super.onPause()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {

31
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
View file

@ -27,6 +27,9 @@ import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionVi
import io.reactivex.functions.Consumer
import org.solovyev.android.checkout.*
import javax.inject.Inject
import android.content.Intent
class GiftIAPActivity: BaseActivity() {
@ -95,6 +98,10 @@ class GiftIAPActivity: BaseActivity() {
usernameTextView.text = "@${it.username}"
giftedUserID = it.id
}, RxErrorHandler.handleEmptyError()))
}
override fun onResume() {
super.onResume()
setupCheckout()
@ -105,6 +112,7 @@ class GiftIAPActivity: BaseActivity() {
if (PurchaseTypes.allSubscriptionNoRenewTypes.contains(purchase.sku)) {
billingRequests?.consume(purchase.token, object : RequestListener<Any> {
override fun onSuccess(o: Any) {
finish()
}
override fun onError(i: Int, e: Exception) {
@ -128,19 +136,24 @@ class GiftIAPActivity: BaseActivity() {
override fun onReady(billingRequests: BillingRequests, s: String, b: Boolean) {}
})
this.subscription1MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription1MonthNoRenew) })
this.subscription3MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription3MonthNoRenew) })
this.subscription6MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription6MonthNoRenew) })
this.subscription12MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription12MonthNoRenew) })
}
override fun onCreateView(name: String?, context: Context?, attrs: AttributeSet?): View? {
val view = super.onCreateView(name, context, attrs)
this.subscription1MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription1Month) })
this.subscription3MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription3Month) })
this.subscription6MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription6Month) })
this.subscription12MonthView?.setOnPurchaseClickListener(View.OnClickListener { selectSubscription(PurchaseTypes.Subscription12Month) })
return view
override fun onPause() {
activityCheckout?.stop()
super.onPause()
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
activityCheckout?.onActivityResult(requestCode, resultCode, data)
}
private fun updateButtonLabel(sku: Sku, price: String, subscriptions: Inventory.Product) {
val matchingView = buttonForSku(sku)
if (matchingView != null) {

9
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
View file

@ -6,22 +6,23 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.view.Gravity
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.animation.AccelerateInterpolator
import android.widget.Toast
import androidx.core.net.toUri
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.extensions.notNull
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
import com.plattysoft.leonids.ParticleSystem
import kotlinx.android.synthetic.main.fragment_about.*
import android.view.animation.AccelerateInterpolator
class AboutFragment : Fragment() {
class AboutFragment : BaseMainFragment() {
override fun injectFragment(component: AppComponent) {
}
internal var userId = ""
private val androidSourceCodeLink = "https://github.com/HabitRPG/habitrpg-android/"

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
View file

@ -137,7 +137,7 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
}
}
fun setReceivingUser(chatRoomUser: String, replyToUserUUID: String) {
private fun setReceivingUser(chatRoomUser: String, replyToUserUUID: String) {
this.chatRoomUser = chatRoomUser
this.replyToUserUUID = replyToUserUUID
}
@ -179,4 +179,8 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
.setNegativeButton(android.R.string.no, null).show()
}
}
override fun customTitle(): String {
return chatRoomUser ?: ""
}
}