aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-22 20:27:22 -0700
committerGitHub <noreply@github.com>2017-07-22 20:27:22 -0700
commit138824065679d3cd88f7f80d48728ffdc777704a (patch)
tree1b2262da7499f226aede68bb26adec6833263d5d /app/src
parent37a9f9057d7879080b7b982f987bf0b82d0d774c (diff)
downloadfrost-138824065679d3cd88f7f80d48728ffdc777704a.tar.gz
frost-138824065679d3cd88f7f80d48728ffdc777704a.tar.bz2
frost-138824065679d3cd88f7f80d48728ffdc777704a.zip
Test new billing logic (#86)v1.3.5
* Add lint * Add new libs * Update libs and add friends tab * Aggressively hide nonrecent posts * Update dependencies * Add php to most recents * Add full size image downloader * Fix css cleaner * Fix notification and circle * Bring back regex * Update kau, optimize imports, and remove string ambiguity * Bring back anjlab iab and move to alpha * Create initial billing test
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/AndroidManifest.xml2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt7
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt16
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt78
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt21
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt10
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt5
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt8
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt226
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt139
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABDialogs.kt10
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBroadcastReceiver.java60
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabException.java43
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabHelper.java1116
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabResult.java45
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Inventory.java91
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Purchase.java66
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Security.java121
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/SkuDetails.java64
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt1
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt5
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/SearchWebView.kt1
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/xml/frost_changelog.xml4
33 files changed, 234 insertions, 1925 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5758f38c..d60854b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,7 +117,7 @@
android:theme="@style/FrostTheme.Settings" />
<activity
android:name=".activities.AboutActivity"
- android:theme="@style/Kau.Translucent.About" />
+ android:theme="@style/Kau.About" />
<activity
android:name=".activities.ImageActivity"
android:theme="@style/FrostTheme.Overlay.Fade" />
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 3f5bdeda..371f9c33 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -4,16 +4,15 @@ import android.app.Application
import android.graphics.drawable.Drawable
import android.net.Uri
import android.widget.ImageView
+import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.signature.ApplicationVersionSignature
import com.crashlytics.android.Crashlytics
import com.crashlytics.android.answers.Answers
import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
import com.mikepenz.materialdrawer.util.DrawerImageLoader
-import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.utils.CrashReportingTree
-import com.pitchedapps.frost.utils.GlideApp
import com.pitchedapps.frost.utils.Prefs
import com.pitchedapps.frost.utils.Showcase
import com.raizlabs.android.dbflow.config.FlowConfig
@@ -65,8 +64,8 @@ class FrostApp : Application() {
DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String) {
val c = imageView.context
- val old = GlideApp.with(c).load(uri).apply(RequestOptions().placeholder(placeholder))
- GlideApp.with(c).load(uri).apply(RequestOptions().signature(ApplicationVersionSignature.obtain(c)))
+ val old = Glide.with(c).load(uri).apply(RequestOptions().placeholder(placeholder))
+ Glide.with(c).load(uri).apply(RequestOptions().signature(ApplicationVersionSignature.obtain(c)))
.thumbnail(old).into(imageView)
}
})
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 0b8c1a56..79d9f782 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -1,7 +1,5 @@
package com.pitchedapps.frost.activities
-import android.animation.ValueAnimator
-import android.annotation.SuppressLint
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.Bitmap
@@ -21,6 +19,7 @@ import ca.allanwang.kau.permissions.PERMISSION_WRITE_EXTERNAL_STORAGE
import ca.allanwang.kau.permissions.kauOnRequestPermissionsResult
import ca.allanwang.kau.permissions.kauRequestPermissions
import ca.allanwang.kau.utils.*
+import com.bumptech.glide.Glide
import com.bumptech.glide.request.target.BaseTarget
import com.bumptech.glide.request.target.SizeReadyCallback
import com.bumptech.glide.request.target.Target
@@ -31,7 +30,10 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.mikepenz.iconics.typeface.IIcon
import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R
-import com.pitchedapps.frost.utils.*
+import com.pitchedapps.frost.utils.ARG_IMAGE_URL
+import com.pitchedapps.frost.utils.ARG_TEXT
+import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.utils.Prefs
import com.sothree.slidinguppanel.SlidingUpPanelLayout
import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
@@ -82,7 +84,8 @@ class ImageActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(if (!text.isNullOrBlank()) R.layout.activity_image else R.layout.activity_image_textless)
+ val layout = if (!text.isNullOrBlank()) R.layout.activity_image else R.layout.activity_image_textless
+ setContentView(layout)
container.setBackgroundColor(Prefs.bgColor.withMinAlpha(222))
caption?.setTextColor(Prefs.textColor)
caption?.setBackgroundColor(Prefs.bgColor.colorToForeground(0.2f).withAlpha(255))
@@ -104,7 +107,7 @@ class ImageActivity : AppCompatActivity() {
imageCallback(null, false)
}
})
- GlideApp.with(this).asBitmap().load(imageUrl).into(PhotoTarget(this::imageCallback))
+ Glide.with(this).asBitmap().load(imageUrl).into(PhotoTarget(this::imageCallback))
}
/**
@@ -196,7 +199,8 @@ class ImageActivity : AppCompatActivity() {
} finally {
L.d("Download image async finished: $success")
uiThread {
- snackbar(if (success) R.string.image_download_success else R.string.image_download_fail)
+ val text = if (success) R.string.image_download_success else R.string.image_download_fail
+ snackbar(text)
if (success) {
deleteTempFile()
fabAction = FabStates.SHARE
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
index 8ca18385..a45bd033 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
@@ -9,7 +9,10 @@ import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.annotation.StringRes
-import android.support.design.widget.*
+import android.support.design.widget.AppBarLayout
+import android.support.design.widget.CoordinatorLayout
+import android.support.design.widget.FloatingActionButton
+import android.support.design.widget.TabLayout
import android.support.v4.app.ActivityOptionsCompat
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
@@ -52,7 +55,8 @@ import com.pitchedapps.frost.facebook.FbTab
import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL
import com.pitchedapps.frost.fragments.WebFragment
import com.pitchedapps.frost.utils.*
-import com.pitchedapps.frost.utils.iab.validatePro
+import com.pitchedapps.frost.utils.iab.FrostBilling
+import com.pitchedapps.frost.utils.iab.IABMain
import com.pitchedapps.frost.views.BadgedIcon
import com.pitchedapps.frost.views.FrostViewPager
import com.pitchedapps.frost.web.SearchWebView
@@ -64,7 +68,8 @@ import org.jsoup.Jsoup
import java.util.concurrent.TimeUnit
class MainActivity : BaseActivity(), SearchWebView.SearchContract,
- ActivityWebContract, FileChooserContract by FileChooserDelegate() {
+ ActivityWebContract, FileChooserContract by FileChooserDelegate(),
+ FrostBilling by IABMain() {
lateinit var adapter: SectionsPagerAdapter
val toolbar: Toolbar by bindView(R.id.toolbar)
@@ -97,12 +102,12 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract,
* Possible responses from the SettingsActivity
* after the configurations have changed
*/
- const val REQUEST_RESTART = 90909
- const val REQUEST_REFRESH = 80808
- const val REQUEST_WEB_ZOOM = 50505
- const val REQUEST_NAV = 10101
- const val REQUEST_SEARCH = 70707
- const val REQUEST_RESTART_APPLICATION = 60606
+ const val REQUEST_RESTART_APPLICATION = 1 shl 1
+ const val REQUEST_RESTART = 1 shl 2
+ const val REQUEST_REFRESH = 1 shl 3
+ const val REQUEST_WEB_ZOOM = 1 shl 4
+ const val REQUEST_NAV = 1 shl 5
+ const val REQUEST_SEARCH = 1 shl 6
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -149,12 +154,12 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract,
viewPager.post { webFragmentObservable.onNext(0); lastPosition = 0 } //trigger hook so title is set
setupDrawer(savedInstanceState)
setupTabs()
- fab.setOnClickListener { view ->
- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show()
- }
+// fab.setOnClickListener { view ->
+// Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+// .setAction("Action", null).show()
+// }
setFrostColors(toolbar, themeWindow = false, headers = arrayOf(tabs, appBar), backgrounds = arrayOf(viewPager))
- validatePro()
+ onCreateBilling()
}
fun tabsForEachView(action: (position: Int, view: BadgedIcon) -> Unit) {
@@ -394,26 +399,28 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract,
if (onActivityResultWeb(requestCode, resultCode, data)) return
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == ACTIVITY_SETTINGS) {
- when (resultCode) {
- REQUEST_RESTART -> restart()
- REQUEST_REFRESH -> webFragmentObservable.onNext(WebFragment.REQUEST_REFRESH)
- REQUEST_NAV -> frostNavigationBar()
- REQUEST_WEB_ZOOM -> webFragmentObservable.onNext(WebFragment.REQUEST_TEXT_ZOOM)
- REQUEST_SEARCH -> invalidateOptionsMenu()
- REQUEST_RESTART_APPLICATION -> { //completely restart application
- L.d("Restart Application Requested")
- val intent = packageManager.getLaunchIntentForPackage(packageName)
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
- val pending = PendingIntent.getActivity(this, 666, intent, PendingIntent.FLAG_CANCEL_CURRENT)
- val alarm = getSystemService(Context.ALARM_SERVICE) as AlarmManager
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
- alarm.setExactAndAllowWhileIdle(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
- else
- alarm.setExact(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
- finish()
- System.exit(0)
- }
+ if (resultCode and REQUEST_RESTART_APPLICATION > 0) { //completely restart application
+ L.d("Restart Application Requested")
+ val intent = packageManager.getLaunchIntentForPackage(packageName)
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+ val pending = PendingIntent.getActivity(this, 666, intent, PendingIntent.FLAG_CANCEL_CURRENT)
+ val alarm = getSystemService(Context.ALARM_SERVICE) as AlarmManager
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+ alarm.setExactAndAllowWhileIdle(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
+ else
+ alarm.setExact(AlarmManager.RTC, System.currentTimeMillis() + 100, pending)
+ finish()
+ System.exit(0)
+ return
}
+ if (resultCode and REQUEST_RESTART > 0) return restart()
+ /*
+ * These results can be stacked
+ */
+ if (resultCode and REQUEST_REFRESH > 0) webFragmentObservable.onNext(WebFragment.REQUEST_REFRESH)
+ if (resultCode and REQUEST_NAV > 0) frostNavigationBar()
+ if (resultCode and REQUEST_WEB_ZOOM > 0) webFragmentObservable.onNext(WebFragment.REQUEST_TEXT_ZOOM)
+ if (resultCode and REQUEST_SEARCH > 0) invalidateOptionsMenu()
}
}
@@ -435,6 +442,11 @@ class MainActivity : BaseActivity(), SearchWebView.SearchContract,
super.onStart()
}
+ override fun onDestroy() {
+ onDestroyBilling()
+ super.onDestroy()
+ }
+
override fun onBackPressed() {
if (searchView?.onBackPressed() ?: false) return
if (currentFragment.onBackPressed()) return
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index c40a705f..a7ca6ce5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -17,27 +17,23 @@ import com.pitchedapps.frost.BuildConfig
import com.pitchedapps.frost.R
import com.pitchedapps.frost.settings.*
import com.pitchedapps.frost.utils.*
-import com.pitchedapps.frost.utils.iab.*
+import com.pitchedapps.frost.utils.iab.FrostBilling
+import com.pitchedapps.frost.utils.iab.IABSettings
+import com.pitchedapps.frost.utils.iab.IS_FROST_PRO
/**
* Created by Allan Wang on 2017-06-06.
*/
-class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListener {
+class SettingsActivity : KPrefActivity(), FrostBilling by IABSettings() {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- if (!IAB.handleActivityResult(requestCode, resultCode, data)) {
+ if (!onActivityResultBilling(requestCode, resultCode, data)) {
super.onActivityResult(requestCode, resultCode, data)
adapter.notifyDataSetChanged()
}
}
-
- override fun receivedBroadcast() {
- L.d("IAB broadcast")
- adapter.notifyDataSetChanged()
- }
-
override fun kPrefCoreAttributes(): CoreAttributeContract.() -> Unit = {
textColor = { Prefs.textColor }
accentColor = { Prefs.accentColor }
@@ -72,7 +68,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe
plainText(R.string.restore_purchases) {
descRes = R.string.restore_purchases_desc
iicon = GoogleMaterial.Icon.gmd_refresh
- onClick = { _, _, _ -> this@SettingsActivity.restorePurchases(); true }
+ onClick = { _, _, _ -> restorePurchases(false); true }
}
plainText(R.string.about_frost) {
@@ -86,7 +82,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe
}
fun KPrefItemBase.BaseContract<*>.dependsOnPro() {
- onDisabledClick = { _, _, _ -> openPlayProPurchase(0); true }
+ onDisabledClick = { _, _, _ -> purchasePro(); true }
enabler = { IS_FROST_PRO }
}
@@ -99,6 +95,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe
super.onCreate(savedInstanceState)
animate = Prefs.animate
themeExterior(false)
+ onCreateBilling()
}
fun themeExterior(animate: Boolean = true) {
@@ -139,7 +136,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe
}
override fun onDestroy() {
- IAB.dispose()
+ onDestroyBilling()
super.onDestroy()
}
} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index 278f2adf..240bfeac 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -1,7 +1,6 @@
package com.pitchedapps.frost.injectors
import android.webkit.WebView
-import com.pitchedapps.frost.utils.L
/**
* Created by Allan Wang on 2017-05-31.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index a24e4778..d9b91225 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -14,15 +14,19 @@ import android.support.v4.app.NotificationManagerCompat
import ca.allanwang.kau.utils.color
import ca.allanwang.kau.utils.dpToPx
import ca.allanwang.kau.utils.string
+import com.bumptech.glide.Glide
import com.bumptech.glide.request.target.SimpleTarget
import com.bumptech.glide.request.transition.Transition
import com.pitchedapps.frost.BuildConfig
-import com.pitchedapps.frost.activities.FrostWebActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.FrostWebActivity
import com.pitchedapps.frost.dbflow.CookieModel
import com.pitchedapps.frost.dbflow.fetchUsername
import com.pitchedapps.frost.facebook.FB_URL_BASE
-import com.pitchedapps.frost.utils.*
+import com.pitchedapps.frost.utils.ARG_USER_ID
+import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.utils.Prefs
+import com.pitchedapps.frost.utils.withRoundIcon
import org.jetbrains.anko.runOnUiThread
/**
@@ -100,7 +104,7 @@ data class NotificationContent(val data: CookieModel,
if (profileUrl.isNotBlank()) {
context.runOnUiThread {
- GlideApp.with(context)
+ Glide.with(context)
.asBitmap()
.load(profileUrl)
.withRoundIcon()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
index ad977d1a..05497904 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
@@ -17,9 +17,7 @@ import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.Prefs
import com.pitchedapps.frost.utils.frostAnswersCustom
-import com.pitchedapps.frost.web.MessageWebView
import org.jetbrains.anko.doAsync
-import org.jetbrains.anko.uiThread
import org.jsoup.Jsoup
import org.jsoup.nodes.Element
import java.util.concurrent.Future
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
index e814e1ac..d38270f7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
@@ -5,13 +5,12 @@ import ca.allanwang.kau.kpref.activity.items.KPrefColorPicker
import ca.allanwang.kau.kpref.activity.items.KPrefSeekbar
import ca.allanwang.kau.ui.views.RippleCanvas
import ca.allanwang.kau.utils.string
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.injectors.CssAssets
import com.pitchedapps.frost.utils.*
import com.pitchedapps.frost.utils.iab.IS_FROST_PRO
-import com.pitchedapps.frost.utils.iab.openPlayProPurchase
import com.pitchedapps.frost.views.KPrefTextSeekbar
/**
@@ -33,7 +32,7 @@ fun SettingsActivity.getAppearancePrefs(): KPrefAdapterBuilder.() -> Unit = {
_, _, which, text ->
if (item.pref != which) {
if (which == Theme.CUSTOM.ordinal && !IS_FROST_PRO) {
- openPlayProPurchase(9)
+ purchasePro()
return@itemsCallbackSingleChoice true
}
item.pref = which
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index e7cf3598..00ff00c3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -1,8 +1,8 @@
package com.pitchedapps.frost.settings
import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.utils.Prefs
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
index 236d19f9..c780948d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Experimental.kt
@@ -1,8 +1,8 @@
package com.pitchedapps.frost.settings
import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.utils.Prefs
import com.pitchedapps.frost.utils.Showcase
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt
index 689e6bdb..9b214c26 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Feed.kt
@@ -2,8 +2,8 @@ package com.pitchedapps.frost.settings
import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
import ca.allanwang.kau.utils.string
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.facebook.FeedSort
import com.pitchedapps.frost.utils.Prefs
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
index 59ebf700..a5aa84d3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
@@ -65,7 +65,8 @@ fun SettingsActivity.getNotificationPrefs(): KPrefAdapterBuilder.() -> Unit = {
descRes = R.string.notification_fetch_now_desc
onClick = {
_, _, _ ->
- snackbar(if (fetchNotifications()) R.string.notification_fetch_success else R.string.notification_fetch_fail)
+ val text = if (fetchNotifications()) R.string.notification_fetch_success else R.string.notification_fetch_fail
+ snackbar(text)
true
}
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index c0db8308..442216fb 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -8,18 +8,13 @@ import android.support.annotation.StringRes
import android.support.design.internal.SnackbarContentLayout
import android.support.design.widget.Snackbar
import android.support.v7.widget.Toolbar
-import android.util.Log
import android.view.View
import android.widget.FrameLayout
import android.widget.TextView
import ca.allanwang.kau.utils.*
import com.afollestad.materialdialogs.MaterialDialog
-import com.bumptech.glide.GlideBuilder
import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.annotation.GlideExtension
-import com.bumptech.glide.annotation.GlideModule
import com.bumptech.glide.load.resource.bitmap.CircleCrop
-import com.bumptech.glide.module.AppGlideModule
import com.bumptech.glide.request.RequestOptions
import com.crashlytics.android.answers.Answers
import com.crashlytics.android.answers.CustomEvent
@@ -42,9 +37,6 @@ const val ARG_USER_ID = "arg_user_id"
const val ARG_IMAGE_URL = "arg_image_url"
const val ARG_TEXT = "arg_text"
-@GlideModule
-class FrostGlideModule : AppGlideModule()
-
fun Context.launchNewTask(clazz: Class<out Activity>, cookieList: ArrayList<CookieModel> = arrayListOf(), clearStack: Boolean = false) {
startActivity(clazz, clearStack, intentBuilder = {
putParcelableArrayListExtra(EXTRA_COOKIES, cookieList)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
index 17ea46a3..40de99bf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt
@@ -5,8 +5,8 @@ import ca.allanwang.kau.utils.copyToClipboard
import ca.allanwang.kau.utils.shareText
import ca.allanwang.kau.utils.string
import ca.allanwang.kau.utils.toast
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
/**
* Created by Allan Wang on 2017-07-07.
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt
deleted file mode 100644
index 445f3ddf..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.pitchedapps.frost.utils.iab
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.support.design.widget.Snackbar
-import ca.allanwang.kau.utils.isFromGooglePlay
-import ca.allanwang.kau.utils.snackbar
-import com.crashlytics.android.answers.PurchaseEvent
-import com.pitchedapps.frost.BuildConfig
-import com.pitchedapps.frost.R
-import com.pitchedapps.frost.activities.SettingsActivity
-import com.pitchedapps.frost.utils.*
-
-/**
- * Created by Allan Wang on 2017-06-23.
- *
- * Helper singleton to handle all billing related queries
- * NOTE
- * Make sure you call [IAB.dispose] once an operation is done to release the resources
- * Also make sure that it is called on the very LAST operation if there are a list of async calls.
- * Otherwise the helper will be prematurely disposed
- *
- * For the most part, billing is handled in the [SettingsActivity] and will be disposed when it is destroyed
- * It may also be handled elsewhere when validating purchases, so those calls should dispose themselves
- */
-object IAB {
-
- private var helper: IabHelper? = null
-
- /**
- * Wrapper function to ensure that the helper exists before executing a command
- *
- * [mustHavePlayStore] decides if dialogs should be shown if play store errors occur
- *
- */
- operator fun invoke(activity: Activity,
- mustHavePlayStore: Boolean = true,
- userRequest: Boolean = true,
- onFailed: () -> Unit = {},
- onStart: (helper: IabHelper) -> Unit) {
- with(activity) {
- if (isInProgress) {
- if (userRequest) snackbar(R.string.iab_still_in_progress, Snackbar.LENGTH_LONG)
- L.d("Play Store IAB in progress")
- } else if (helper?.disposed ?: true) {
- helper = null
- L.d("Play Store IAB setup async")
- if (!isFrostPlay) {
- if (mustHavePlayStore) playStoreNotFound()
- onFailed()
- return
- }
- try {
- helper = IabHelper(applicationContext, PUBLIC_BILLING_KEY)
- helper!!.enableDebugLogging(BuildConfig.DEBUG || Prefs.verboseLogging, "Frost:")
- helper!!.startSetup {
- result ->
- L.d("Play Store IAB setup finished; ${result.isSuccess}")
- if (result.isSuccess) {
- L.d("Play Store IAB setup success")
- onStart(helper!!)
- } else {
- L.d("Play Store IAB setup fail")
- if (mustHavePlayStore)
- activity.playStoreGenericError("Setup error: ${result.response} ${result.message}")
- onFailed()
- IAB.dispose()
- }
- }
- } catch (e: Exception) {
- L.e(e, "Play Store IAB error")
- if (mustHavePlayStore)
- playStoreGenericError(null)
- onFailed()
- IAB.dispose()
- }
- } else onStart(helper!!)
- }
- }
-
- fun handleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean
- = helper?.handleActivityResult(requestCode, resultCode, data) ?: false
-
- /**
- * Call this after any execution to dispose the helper
- */
- fun dispose() {
- synchronized(this) {
- L.d("Play Store IAB dispose")
- helper?.disposeWhenFinished()
- helper = null
- }
- }
-
- /**
- * Dispose given helper and check if it matches with our own helper
- */
- fun dispose(helper: IabHelper) {
- synchronized(this) {
- L.d("Play Store IAB helper dispose")
- helper.disposeWhenFinished()
- if (IAB.helper?.disposed ?: true)
- this.helper = null
- }
- }
-
- val isInProgress: Boolean
- get() = helper?.mAsyncInProgress ?: false
-}
-
-private const val FROST_PRO = "frost_pro"
-
-private val IabHelper.disposed: Boolean
- get() = mDisposed || mDisposeAfterAsync
-
-val IS_FROST_PRO: Boolean
- get() = (BuildConfig.DEBUG && Prefs.debugPro) || Prefs.pro
-
-private val Context.isFrostPlay: Boolean
- get() = isFromGooglePlay || BuildConfig.DEBUG
-
-fun SettingsActivity.restorePurchases() {
- //like validate, but with a snackbar and without other prompts
- val restore = container.snackbar(R.string.restoring_purchases, Snackbar.LENGTH_INDEFINITE)
- restore.setAction(R.string.kau_close) { restore.dismiss() }
- //called if inventory is not properly retrieved
- val reset = {
- L.d("Play Store Restore reset")
- if (Prefs.pro) {
- Prefs.pro = false
- Prefs.theme = Theme.DEFAULT.ordinal
- }
- finishRestore(restore, false)
- }
- getInventory(false, true, reset) {
- inv, _ ->
- val proSku = inv.hasPurchase(FROST_PRO)
- Prefs.pro = proSku
- L.d("Play Store Restore found: ${Prefs.pro}")
- finishRestore(restore, Prefs.pro)
- }
-}
-
-private fun SettingsActivity.finishRestore(snackbar: Snackbar, hasPro: Boolean) {
- snackbar.dismiss()
- materialDialogThemed {
- title(R.string.purchases_restored)
- content(if (hasPro) R.string.purchases_restored_with_pro else R.string.purchases_restored_without_pro)
- positiveText(R.string.reload)
- dismissListener { adapter.notifyAdapterDataSetChanged() }
- }
-}
-
-/**
- * If user has pro, check if it's valid and destroy the helper
- * If cache matches result, it finishes silently
- */
-fun Activity.validatePro() {
- L.d("Play Store Validate pro")
- try {
- getInventory(Prefs.pro, false, { if (Prefs.pro) playStoreNoLongerPro() }) {
- inv, helper ->
- val proSku = inv.hasPurchase(FROST_PRO)
- L.d("Play Store Validation finished: ${Prefs.pro} should be $proSku")
- if (!proSku && Prefs.pro) playStoreNoLongerPro()
- else if (proSku && !Prefs.pro) playStoreFoundPro()
- IAB.dispose(helper)
- }
- } catch (e: Exception) {
- L.e(e, "Play store validation exception")
- IAB.dispose()
- }
-}
-
-fun Activity.getInventory(
- mustHavePlayStore: Boolean = true,
- userRequest: Boolean = true,
- onFailed: () -> Unit = {},
- onSuccess: (inv: Inventory, helper: IabHelper) -> Unit) {
- IAB(this, mustHavePlayStore, userRequest, onFailed) {
- helper ->
- helper.queryInventoryAsync {
- res, inv ->
- L.d("Play Store Inventory query finished")
- if (res.isFailure || inv == null) {
- L.e("Play Store Res error ${res.message}")
- onFailed()
- } else onSuccess(inv, helper)
- }
- }
-}
-
-fun Activity.openPlayProPurchase(code: Int) {
- if (!isFrostPlay)
- playStoreProNotAvailable()
- else openPlayPurchase(FROST_PRO, code) {
- Prefs.pro = true
- }
-}
-
-fun Activity.openPlayPurchase(key: String, code: Int, onSuccess: (key: String) -> Unit) {
- L.d("Play Store open purchase $key $code")
- getInventory(true, true, { playStoreGenericError("Query res error") }) {
- inv, helper ->
- if (inv.hasPurchase(key)) {
- playStoreAlreadyPurchased(key)
- onSuccess(key)
- return@getInventory
- }
- L.d("IAB: inventory ${inv.allOwnedSkus}")
- helper.launchPurchaseFlow(this@openPlayPurchase, key, code) {
- result, _ ->
- if (result.isSuccess) {
- onSuccess(key)
- playStorePurchasedSuccessfully(key)
- }
- frostAnswers {
- logPurchase(PurchaseEvent()
- .putItemId(key)
- .putCustomAttribute("result", result.message)
- .putSuccess(result.isSuccess))
- }
- }
- }
-} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt
new file mode 100644
index 00000000..53d3e058
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt
@@ -0,0 +1,139 @@
+package com.pitchedapps.frost.utils.iab
+
+import android.app.Activity
+import android.content.Intent
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.TransactionDetails
+import com.crashlytics.android.answers.PurchaseEvent
+import com.pitchedapps.frost.BuildConfig
+import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.utils.Prefs
+import com.pitchedapps.frost.utils.frostAnswers
+import org.jetbrains.anko.doAsync
+import org.jetbrains.anko.uiThread
+
+/**
+ * Created by Allan Wang on 2017-07-22.
+ */
+private const val FROST_PRO = "frost_pro"
+
+val IS_FROST_PRO: Boolean
+ get() = (BuildConfig.DEBUG && Prefs.debugPro) || Prefs.pro
+
+interface FrostBilling : BillingProcessor.IBillingHandler {
+ fun Activity.onCreateBilling()
+ fun onDestroyBilling()
+ fun purchasePro()
+ fun restorePurchases(once: Boolean)
+ fun onActivityResultBilling(requestCode: Int, resultCode: Int, data: Intent?): Boolean
+}
+
+open class IABBinder : FrostBilling {
+
+ var bp: BillingProcessor? = null
+ var activity: Activity? = null
+
+ override fun Activity.onCreateBilling() {
+ bp = BillingProcessor.newBillingProcessor(this, PUBLIC_BILLING_KEY, this@IABBinder)
+ activity = this
+ bp!!.initialize()
+ }
+
+ override fun onDestroyBilling() {
+ bp?.release()
+ bp = null
+ activity = null
+ }
+
+ override fun onBillingInitialized() {
+ L.d("IAB initialized")
+ }
+
+ override fun onPurchaseHistoryRestored() {
+ L.d("IAB restored")
+ }
+
+ override fun onProductPurchased(productId: String, details: TransactionDetails) {
+ L.d("IAB $productId purchased")
+ frostAnswers {
+ logPurchase(PurchaseEvent()
+ .putItemId(productId)
+ .putSuccess(true)
+ )
+ }
+ }
+
+ override fun onBillingError(errorCode: Int, error: Throwable) {
+ frostAnswers {
+ logPurchase(PurchaseEvent()
+ .putCustomAttribute("result", errorCode.toString())
+ .putSuccess(false))
+ }
+ L.e(error, "IAB error $errorCode")
+ }
+
+ override fun onActivityResultBilling(requestCode: Int, resultCode: Int, data: Intent?): Boolean
+ = bp?.handleActivityResult(requestCode, resultCode, data) ?: false
+
+ override fun purchasePro() {
+ if (bp == null) return
+ if (!bp!!.isOneTimePurchaseSupported)
+ activity!!.playStorePurchaseUnsupported()
+ else
+ bp!!.purchase(activity, FROST_PRO)
+ }
+
+ override fun restorePurchases(once: Boolean) {
+ if (bp == null) return
+ doAsync {
+ bp?.loadOwnedPurchasesFromGoogle()
+ if (bp?.isPurchased(FROST_PRO) ?: false) {
+ uiThread {
+ if (Prefs.pro) activity!!.playStoreNoLongerPro()
+ else if (!once) purchasePro()
+ if (once) onDestroyBilling()
+ }
+ } else {
+ uiThread {
+ if (!Prefs.pro) activity!!.playStoreFoundPro()
+ else if (!once) activity!!.purchaseRestored()
+ if (once) onDestroyBilling()
+ }
+ }
+ }
+ }
+}
+
+class IABSettings : IABBinder() {
+
+ override fun onBillingInitialized() {
+ super.onBillingInitialized()
+
+ }
+
+ override fun onPurchaseHistoryRestored() {
+ super.onPurchaseHistoryRestored()
+ }
+
+ override fun onProductPurchased(productId: String, details: TransactionDetails) {
+ super.onProductPurchased(productId, details)
+ }
+
+ override fun onBillingError(errorCode: Int, error: Throwable) {
+ super.onBillingError(errorCode, error)
+ activity?.playStoreGenericError(null)
+ }
+}
+
+class IABMain : IABBinder() {
+
+ override fun onBillingInitialized() {
+ super.onBillingInitialized()
+ restorePurchases(true)
+ }
+
+ override fun onPurchaseHistoryRestored() {
+ super.onPurchaseHistoryRestored()
+ restorePurchases(true)
+ }
+} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABDialogs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABDialogs.kt
index fae2f6bb..4f750b6b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABDialogs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABDialogs.kt
@@ -4,8 +4,8 @@ import android.app.Activity
import ca.allanwang.kau.utils.restart
import ca.allanwang.kau.utils.startPlayStoreLink
import ca.allanwang.kau.utils.string
-import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.R
+import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.activities.SettingsActivity
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.Prefs
@@ -14,6 +14,7 @@ import com.pitchedapps.frost.utils.materialDialogThemed
/**
* Created by Allan Wang on 2017-06-30.
*/
+
private fun playStoreLog(text: String) {
L.e(Throwable(text), "Play Store Exception")
}
@@ -28,7 +29,6 @@ private fun Activity.playRestart() {
} else restart()
}
-
fun Activity.playStoreNoLongerPro() {
Prefs.pro = false
playStoreLog("No Longer Pro")
@@ -55,11 +55,11 @@ fun Activity.playStoreFoundPro() {
}
}
-fun Activity.playStoreNotFound() {
+fun Activity.playStorePurchaseUnsupported() {
L.d("Play store not found")
materialDialogThemed {
title(R.string.uh_oh)
- content(R.string.play_store_not_found)
+ content(R.string.play_store_unsupported)
positiveText(R.string.kau_ok)
neutralText(R.string.kau_play_store)
onNeutral { _, _ -> startPlayStoreLink(R.string.play_store_package_id) }
@@ -107,7 +107,7 @@ fun Activity.playStorePurchasedSuccessfully(key: String) {
}
}
-fun SettingsActivity.purchaseRestored() {
+fun Activity.purchaseRestored() {
L.d("Purchase restored")
materialDialogThemed {
title(R.string.play_thank_you)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBroadcastReceiver.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBroadcastReceiver.java
deleted file mode 100644
index d325de7c..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBroadcastReceiver.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (c) 2014 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * Receiver for the "com.android.vending.billing.PURCHASES_UPDATED" Action
- * from the Play Store.
- *
- * <p>It is possible that an in-app item may be acquired without the
- * application calling getBuyIntent(), for example if the item can be
- * redeemed from inside the Play Store using a promotional code. If this
- * application isn't running at the time, then when it is started a call
- * to getPurchases() will be sufficient notification. However, if the
- * application is already running in the background when the item is acquired,
- * a message to this BroadcastReceiver will indicate that the an item
- * has been acquired.</p>
- */
-public class IabBroadcastReceiver extends BroadcastReceiver {
- /**
- * Listener interface for received broadcast messages.
- */
- public interface IabBroadcastListener {
- void receivedBroadcast();
- }
-
- /**
- * The Intent action that this Receiver should filter for.
- */
- public static final String ACTION = "com.android.vending.billing.PURCHASES_UPDATED";
-
- private final IabBroadcastListener mListener;
-
- public IabBroadcastReceiver(IabBroadcastListener listener) {
- mListener = listener;
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- if (mListener != null) {
- mListener.receivedBroadcast();
- }
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabException.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabException.java
deleted file mode 100644
index 52f9bd0a..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-/**
- * Exception thrown when something went wrong with in-app billing.
- * An IabException has an associated IabResult (an error).
- * To get the IAB result that caused this exception to be thrown,
- * call {@link #getResult()}.
- */
-public class IabException extends Exception {
- IabResult mResult;
-
- public IabException(IabResult r) {
- this(r, null);
- }
- public IabException(int response, String message) {
- this(new IabResult(response, message));
- }
- public IabException(IabResult r, Exception cause) {
- super(r.getMessage(), cause);
- mResult = r;
- }
- public IabException(int response, String message, Exception cause) {
- this(new IabResult(response, message), cause);
- }
-
- /** Returns the IAB result (error) that this exception signals. */
- public IabResult getResult() { return mResult; }
-} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabHelper.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabHelper.java
deleted file mode 100644
index 5faacc1b..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabHelper.java
+++ /dev/null
@@ -1,1116 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
-import android.content.ServiceConnection;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.vending.billing.IInAppBillingService;
-
-import org.json.JSONException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Provides convenience methods for in-app billing. You can create one instance of this
- * class for your application and use it to process in-app billing operations.
- * It provides synchronous (blocking) and asynchronous (non-blocking) methods for
- * many common in-app billing operations, as well as automatic signature
- * verification.
- *
- * After instantiating, you must perform setup in order to start using the object.
- * To perform setup, call the {@link #startSetup} method and provide a listener;
- * that listener will be notified when setup is complete, after which (and not before)
- * you may call other methods.
- *
- * After setup is complete, you will typically want to request an inventory of owned
- * items and subscriptions. See {@link #queryInventory}, {@link #queryInventoryAsync}
- * and related methods.
- *
- * When you are done with this object, don't forget to call {@link #dispose}
- * to ensure proper cleanup. This object holds a binding to the in-app billing
- * service, which will leak unless you dispose of it correctly. If you created
- * the object on an Activity's onCreate method, then the recommended
- * place to dispose of it is the Activity's onDestroy method. It is invalid to
- * dispose the object while an asynchronous operation is in progress. You can
- * call {@link #disposeWhenFinished()} to ensure that any in-progress operation
- * completes before the object is disposed.
- *
- * A note about threading: When using this object from a background thread, you may
- * call the blocking versions of methods; when using from a UI thread, call
- * only the asynchronous versions and handle the results via callbacks.
- * Also, notice that you can only call one asynchronous operation at a time;
- * attempting to start a second asynchronous operation while the first one
- * has not yet completed will result in an exception being thrown.
- *
- */
-public class IabHelper {
- // Is debug logging enabled?
- boolean mDebugLog = false;
- String mDebugTag = "IabHelper";
-
- // Is setup done?
- boolean mSetupDone = false;
-
- // Has this object been disposed of? (If so, we should ignore callbacks, etc)
- boolean mDisposed = false;
-
- // Do we need to dispose this object after an in-progress asynchronous operation?
- boolean mDisposeAfterAsync = false;
-
- // Are subscriptions supported?
- boolean mSubscriptionsSupported = false;
-
- // Is subscription update supported?
- boolean mSubscriptionUpdateSupported = false;
-
- // Is an asynchronous operation in progress?
- // (only one at a time can be in progress)
- boolean mAsyncInProgress = false;
-
- // Ensure atomic access to mAsyncInProgress and mDisposeAfterAsync.
- private final Object mAsyncInProgressLock = new Object();
-
- // (for logging/debugging)
- // if mAsyncInProgress == true, what asynchronous operation is in progress?
- String mAsyncOperation = "";
-
- // Context we were passed during initialization
- Context mContext;
-
- // Connection to the service
- IInAppBillingService mService;
- ServiceConnection mServiceConn;
-
- // The request code used to launch purchase flow
- int mRequestCode;
-
- // The item type of the current purchase flow
- String mPurchasingItemType;
-
- // Public key for verifying signature, in base64 encoding
- String mSignatureBase64 = null;
-
- // Billing response codes
- public static final int BILLING_RESPONSE_RESULT_OK = 0;
- public static final int BILLING_RESPONSE_RESULT_USER_CANCELED = 1;
- public static final int BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE = 2;
- public static final int BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE = 3;
- public static final int BILLING_RESPONSE_RESULT_ITEM_UNAVAILABLE = 4;
- public static final int BILLING_RESPONSE_RESULT_DEVELOPER_ERROR = 5;
- public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
- public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
- public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
-
- // IAB Helper error codes
- public static final int IABHELPER_ERROR_BASE = -1000;
- public static final int IABHELPER_REMOTE_EXCEPTION = -1001;
- public static final int IABHELPER_BAD_RESPONSE = -1002;
- public static final int IABHELPER_VERIFICATION_FAILED = -1003;
- public static final int IABHELPER_SEND_INTENT_FAILED = -1004;
- public static final int IABHELPER_USER_CANCELLED = -1005;
- public static final int IABHELPER_UNKNOWN_PURCHASE_RESPONSE = -1006;
- public static final int IABHELPER_MISSING_TOKEN = -1007;
- public static final int IABHELPER_UNKNOWN_ERROR = -1008;
- public static final int IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE = -1009;
- public static final int IABHELPER_INVALID_CONSUMPTION = -1010;
- public static final int IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE = -1011;
-
- // Keys for the responses from InAppBillingService
- public static final String RESPONSE_CODE = "RESPONSE_CODE";
- public static final String RESPONSE_GET_SKU_DETAILS_LIST = "DETAILS_LIST";
- public static final String RESPONSE_BUY_INTENT = "BUY_INTENT";
- public static final String RESPONSE_INAPP_PURCHASE_DATA = "INAPP_PURCHASE_DATA";
- public static final String RESPONSE_INAPP_SIGNATURE = "INAPP_DATA_SIGNATURE";
- public static final String RESPONSE_INAPP_ITEM_LIST = "INAPP_PURCHASE_ITEM_LIST";
- public static final String RESPONSE_INAPP_PURCHASE_DATA_LIST = "INAPP_PURCHASE_DATA_LIST";
- public static final String RESPONSE_INAPP_SIGNATURE_LIST = "INAPP_DATA_SIGNATURE_LIST";
- public static final String INAPP_CONTINUATION_TOKEN = "INAPP_CONTINUATION_TOKEN";
-
- // Item types
- public static final String ITEM_TYPE_INAPP = "inapp";
- public static final String ITEM_TYPE_SUBS = "subs";
-
- // some fields on the getSkuDetails response bundle
- public static final String GET_SKU_DETAILS_ITEM_LIST = "ITEM_ID_LIST";
- public static final String GET_SKU_DETAILS_ITEM_TYPE_LIST = "ITEM_TYPE_LIST";
-
- /**
- * Creates an instance. After creation, it will not yet be ready to use. You must perform
- * setup by calling {@link #startSetup} and wait for setup to complete. This constructor does not
- * block and is safe to call from a UI thread.
- *
- * @param ctx Your application or Activity context. Needed to bind to the in-app billing service.
- * @param base64PublicKey Your application's public key, encoded in base64.
- * This is used for verification of purchase signatures. You can find your app's base64-encoded
- * public key in your application's page on Google Play Developer Console. Note that this
- * is NOT your "developer public key".
- */
- public IabHelper(Context ctx, String base64PublicKey) {
- mContext = ctx.getApplicationContext();
- mSignatureBase64 = base64PublicKey;
- logDebug("IAB helper created.");
- }
-
- /**
- * Enables or disable debug logging through LogCat.
- */
- public void enableDebugLogging(boolean enable, String tag) {
- checkNotDisposed();
- mDebugLog = enable;
- mDebugTag = tag;
- }
-
- public void enableDebugLogging(boolean enable) {
- checkNotDisposed();
- mDebugLog = enable;
- }
-
- /**
- * Callback for setup process. This listener's {@link #onIabSetupFinished} method is called
- * when the setup process is complete.
- */
- public interface OnIabSetupFinishedListener {
- /**
- * Called to notify that setup is complete.
- *
- * @param result The result of the setup process.
- */
- void onIabSetupFinished(IabResult result);
- }
-
- /**
- * Starts the setup process. This will start up the setup process asynchronously.
- * You will be notified through the listener when the setup process is complete.
- * This method is safe to call from a UI thread.
- *
- * @param listener The listener to notify when the setup process is complete.
- */
- public void startSetup(final OnIabSetupFinishedListener listener) {
- // If already set up, can't do it again.
- checkNotDisposed();
- if (mSetupDone) throw new IllegalStateException("IAB helper is already set up.");
-
- // Connection to IAB service
- logDebug("Starting in-app billing setup.");
- mServiceConn = new ServiceConnection() {
- @Override
- public void onServiceDisconnected(ComponentName name) {
- logDebug("Billing service disconnected.");
- mService = null;
- }
-
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- if (mDisposed) return;
- logDebug("Billing service connected.");
- mService = IInAppBillingService.Stub.asInterface(service);
- String packageName = mContext.getPackageName();
- try {
- logDebug("Checking for in-app billing 3 support.");
-
- // check for in-app billing v3 support
- int response = mService.isBillingSupported(3, packageName, ITEM_TYPE_INAPP);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- if (listener != null) listener.onIabSetupFinished(new IabResult(response,
- "Error checking for billing v3 support."));
-
- // if in-app purchases aren't supported, neither are subscriptions
- mSubscriptionsSupported = false;
- mSubscriptionUpdateSupported = false;
- return;
- } else {
- logDebug("In-app billing version 3 supported for " + packageName);
- }
-
- // Check for v5 subscriptions support. This is needed for
- // getBuyIntentToReplaceSku which allows for subscription update
- response = mService.isBillingSupported(5, packageName, ITEM_TYPE_SUBS);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Subscription re-signup AVAILABLE.");
- mSubscriptionUpdateSupported = true;
- } else {
- logDebug("Subscription re-signup not available.");
- mSubscriptionUpdateSupported = false;
- }
-
- if (mSubscriptionUpdateSupported) {
- mSubscriptionsSupported = true;
- } else {
- // check for v3 subscriptions support
- response = mService.isBillingSupported(3, packageName, ITEM_TYPE_SUBS);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Subscriptions AVAILABLE.");
- mSubscriptionsSupported = true;
- } else {
- logDebug("Subscriptions NOT AVAILABLE. Response: " + response);
- mSubscriptionsSupported = false;
- mSubscriptionUpdateSupported = false;
- }
- }
-
- mSetupDone = true;
- }
- catch (RemoteException e) {
- if (listener != null) {
- listener.onIabSetupFinished(new IabResult(IABHELPER_REMOTE_EXCEPTION,
- "RemoteException while setting up in-app billing."));
- }
- e.printStackTrace();
- return;
- }
-
- if (listener != null) {
- listener.onIabSetupFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Setup successful."));
- }
- }
- };
-
- Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
- serviceIntent.setPackage("com.android.vending");
- List<ResolveInfo> intentServices = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
- if (intentServices != null && !intentServices.isEmpty()) {
- // service available to handle that Intent
- mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
- }
- else {
- // no service available to handle that Intent
- if (listener != null) {
- listener.onIabSetupFinished(
- new IabResult(BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE,
- "Billing service unavailable on device."));
- }
- }
- }
-
- /**
- * Dispose of object, releasing resources. It's very important to call this
- * method when you are done with this object. It will release any resources
- * used by it such as service connections. Naturally, once the object is
- * disposed of, it can't be used again.
- */
- public void dispose() throws IabAsyncInProgressException {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- throw new IabAsyncInProgressException("Can't dispose because an async operation " +
- "(" + mAsyncOperation + ") is in progress.");
- }
- }
- logDebug("Disposing.");
- mSetupDone = false;
- if (mServiceConn != null) {
- logDebug("Unbinding from service.");
- if (mContext != null) mContext.unbindService(mServiceConn);
- }
- mDisposed = true;
- mContext = null;
- mServiceConn = null;
- mService = null;
- mPurchaseListener = null;
- }
-
- /**
- * Disposes of object, releasing resources. If there is an in-progress async operation, this
- * method will queue the dispose to occur after the operation has finished.
- */
- public void disposeWhenFinished() {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- logDebug("Will dispose after async operation finishes.");
- mDisposeAfterAsync = true;
- } else {
- try {
- dispose();
- } catch (IabAsyncInProgressException e) {
- // Should never be thrown, because we call dispose() only after checking that
- // there's not already an async operation in progress.
- }
- }
- }
- }
-
- private void checkNotDisposed() {
- if (mDisposed) throw new IllegalStateException("IabHelper was disposed of, so it cannot be used.");
- }
-
- /** Returns whether subscriptions are supported. */
- public boolean subscriptionsSupported() {
- checkNotDisposed();
- return mSubscriptionsSupported;
- }
-
-
- /**
- * Callback that notifies when a purchase is finished.
- */
- public interface OnIabPurchaseFinishedListener {
- /**
- * Called to notify that an in-app purchase finished. If the purchase was successful,
- * then the sku parameter specifies which item was purchased. If the purchase failed,
- * the sku and extraData parameters may or may not be null, depending on how far the purchase
- * process went.
- *
- * @param result The result of the purchase.
- * @param info The purchase information (null if purchase failed)
- */
- void onIabPurchaseFinished(IabResult result, Purchase info);
- }
-
- // The listener registered on launchPurchaseFlow, which we have to call back when
- // the purchase finishes
- OnIabPurchaseFinishedListener mPurchaseListener;
-
- public void launchPurchaseFlow(Activity act, String sku, int requestCode, OnIabPurchaseFinishedListener listener)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, requestCode, listener, "");
- }
-
- public void launchPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, ITEM_TYPE_INAPP, null, requestCode, listener, extraData);
- }
-
- public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener) throws IabAsyncInProgressException {
- launchSubscriptionPurchaseFlow(act, sku, requestCode, listener, "");
- }
-
- public void launchSubscriptionPurchaseFlow(Activity act, String sku, int requestCode,
- OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- launchPurchaseFlow(act, sku, ITEM_TYPE_SUBS, null, requestCode, listener, extraData);
- }
-
- /**
- * Initiate the UI flow for an in-app purchase. Call this method to initiate an in-app purchase,
- * which will involve bringing up the Google Play screen. The calling activity will be paused
- * while the user interacts with Google Play, and the result will be delivered via the
- * activity's {@link Activity#onActivityResult} method, at which point you must call
- * this object's {@link #handleActivityResult} method to continue the purchase flow. This method
- * MUST be called from the UI thread of the Activity.
- *
- * @param act The calling activity.
- * @param sku The sku of the item to purchase.
- * @param itemType indicates if it's a product or a subscription (ITEM_TYPE_INAPP or
- * ITEM_TYPE_SUBS)
- * @param oldSkus A list of SKUs which the new SKU is replacing or null if there are none
- * @param requestCode A request code (to differentiate from other responses -- as in
- * {@link Activity#startActivityForResult}).
- * @param listener The listener to notify when the purchase process finishes
- * @param extraData Extra data (developer payload), which will be returned with the purchase
- * data when the purchase completes. This extra data will be permanently bound to that
- * purchase and will always be returned when the purchase is queried.
- */
- public void launchPurchaseFlow(Activity act, String sku, String itemType, List<String> oldSkus,
- int requestCode, OnIabPurchaseFinishedListener listener, String extraData)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("launchPurchaseFlow");
- flagStartAsync("launchPurchaseFlow");
- IabResult result;
-
- if (itemType.equals(ITEM_TYPE_SUBS) && !mSubscriptionsSupported) {
- IabResult r = new IabResult(IABHELPER_SUBSCRIPTIONS_NOT_AVAILABLE,
- "Subscriptions are not available.");
- flagEndAsync();
- if (listener != null) listener.onIabPurchaseFinished(r, null);
- return;
- }
-
- try {
- logDebug("Constructing buy intent for " + sku + ", item type: " + itemType);
- Bundle buyIntentBundle;
- if (oldSkus == null || oldSkus.isEmpty()) {
- // Purchasing a new item or subscription re-signup
- buyIntentBundle = mService.getBuyIntent(3, mContext.getPackageName(), sku, itemType,
- extraData);
- } else {
- // Subscription upgrade/downgrade
- if (!mSubscriptionUpdateSupported) {
- IabResult r = new IabResult(IABHELPER_SUBSCRIPTION_UPDATE_NOT_AVAILABLE,
- "Subscription updates are not available.");
- flagEndAsync();
- if (listener != null) listener.onIabPurchaseFinished(r, null);
- return;
- }
- buyIntentBundle = mService.getBuyIntentToReplaceSkus(5, mContext.getPackageName(),
- oldSkus, sku, itemType, extraData);
- }
- int response = getResponseCodeFromBundle(buyIntentBundle);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logError("Unable to buy item, Error response: " + getResponseDesc(response));
- flagEndAsync();
- result = new IabResult(response, "Unable to buy item");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- return;
- }
-
- PendingIntent pendingIntent = buyIntentBundle.getParcelable(RESPONSE_BUY_INTENT);
- logDebug("Launching buy intent for " + sku + ". Request code: " + requestCode);
- mRequestCode = requestCode;
- mPurchaseListener = listener;
- mPurchasingItemType = itemType;
- act.startIntentSenderForResult(pendingIntent.getIntentSender(),
- requestCode, new Intent(),
- Integer.valueOf(0), Integer.valueOf(0),
- Integer.valueOf(0));
- }
- catch (SendIntentException e) {
- logError("SendIntentException while launching purchase flow for sku " + sku);
- e.printStackTrace();
- flagEndAsync();
-
- result = new IabResult(IABHELPER_SEND_INTENT_FAILED, "Failed to send intent.");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- }
- catch (RemoteException e) {
- logError("RemoteException while launching purchase flow for sku " + sku);
- e.printStackTrace();
- flagEndAsync();
-
- result = new IabResult(IABHELPER_REMOTE_EXCEPTION, "Remote exception while starting purchase flow");
- if (listener != null) listener.onIabPurchaseFinished(result, null);
- }
- }
-
- /**
- * Handles an activity result that's part of the purchase flow in in-app billing. If you
- * are calling {@link #launchPurchaseFlow}, then you must call this method from your
- * Activity's {@link Activity@onActivityResult} method. This method
- * MUST be called from the UI thread of the Activity.
- *
- * @param requestCode The requestCode as you received it.
- * @param resultCode The resultCode as you received it.
- * @param data The data (Intent) as you received it.
- * @return Returns true if the result was related to a purchase flow and was handled;
- * false if the result was not related to a purchase, in which case you should
- * handle it normally.
- */
- public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
- IabResult result;
- if (requestCode != mRequestCode) return false;
-
- checkNotDisposed();
- checkSetupDone("handleActivityResult");
-
- // end of async purchase operation that started on launchPurchaseFlow
- flagEndAsync();
-
- if (data == null) {
- logError("Null data in IAB activity result.");
- result = new IabResult(IABHELPER_BAD_RESPONSE, "Null data in IAB result");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- int responseCode = getResponseCodeFromIntent(data);
- String purchaseData = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA);
- String dataSignature = data.getStringExtra(RESPONSE_INAPP_SIGNATURE);
-
- if (resultCode == Activity.RESULT_OK && responseCode == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Successful resultcode from purchase activity.");
- logDebug("Purchase data: " + purchaseData);
- logDebug("Data signature: " + dataSignature);
- logDebug("Extras: " + data.getExtras());
- logDebug("Expected item type: " + mPurchasingItemType);
-
- if (purchaseData == null || dataSignature == null) {
- logError("BUG: either purchaseData or dataSignature is null.");
- logDebug("Extras: " + data.getExtras().toString());
- result = new IabResult(IABHELPER_UNKNOWN_ERROR, "IAB returned null purchaseData or dataSignature");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- Purchase purchase = null;
- try {
- purchase = new Purchase(mPurchasingItemType, purchaseData, dataSignature);
- String sku = purchase.getSku();
-
- // Verify signature
- if (!Security.verifyPurchase(mSignatureBase64, purchaseData, dataSignature)) {
- logError("Purchase signature verification FAILED for sku " + sku);
- result = new IabResult(IABHELPER_VERIFICATION_FAILED, "Signature verification failed for sku " + sku);
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, purchase);
- return true;
- }
- logDebug("Purchase signature successfully verified.");
- }
- catch (JSONException e) {
- logError("Failed to parse purchase data.");
- e.printStackTrace();
- result = new IabResult(IABHELPER_BAD_RESPONSE, "Failed to parse purchase data.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- return true;
- }
-
- if (mPurchaseListener != null) {
- mPurchaseListener.onIabPurchaseFinished(new IabResult(BILLING_RESPONSE_RESULT_OK, "Success"), purchase);
- }
- }
- else if (resultCode == Activity.RESULT_OK) {
- // result code was OK, but in-app billing response was not OK.
- logDebug("Result code was OK but in-app billing response was not OK: " + getResponseDesc(responseCode));
- if (mPurchaseListener != null) {
- result = new IabResult(responseCode, "Problem purchashing item.");
- mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- }
- else if (resultCode == Activity.RESULT_CANCELED) {
- logDebug("Purchase canceled - Response: " + getResponseDesc(responseCode));
- result = new IabResult(IABHELPER_USER_CANCELLED, "User canceled.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- else {
- logError("Purchase failed. Result code: " + Integer.toString(resultCode)
- + ". Response: " + getResponseDesc(responseCode));
- result = new IabResult(IABHELPER_UNKNOWN_PURCHASE_RESPONSE, "Unknown purchase response.");
- if (mPurchaseListener != null) mPurchaseListener.onIabPurchaseFinished(result, null);
- }
- return true;
- }
-
- public Inventory queryInventory() throws IabException {
- return queryInventory(false, null, null);
- }
-
- /**
- * Queries the inventory. This will query all owned items from the server, as well as
- * information on additional skus, if specified. This method may block or take long to execute.
- * Do not call from a UI thread. For that, use the non-blocking version {@link #queryInventoryAsync}.
- *
- * @param querySkuDetails if true, SKU details (price, description, etc) will be queried as well
- * as purchase information.
- * @param moreItemSkus additional PRODUCT skus to query information on, regardless of ownership.
- * Ignored if null or if querySkuDetails is false.
- * @param moreSubsSkus additional SUBSCRIPTIONS skus to query information on, regardless of ownership.
- * Ignored if null or if querySkuDetails is false.
- * @throws IabException if a problem occurs while refreshing the inventory.
- */
- public Inventory queryInventory(boolean querySkuDetails, List<String> moreItemSkus,
- List<String> moreSubsSkus) throws IabException {
- checkNotDisposed();
- checkSetupDone("queryInventory");
- try {
- Inventory inv = new Inventory();
- int r = queryPurchases(inv, ITEM_TYPE_INAPP);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying owned items).");
- }
-
- if (querySkuDetails) {
- r = querySkuDetails(ITEM_TYPE_INAPP, inv, moreItemSkus);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying prices of items).");
- }
- }
-
- // if subscriptions are supported, then also query for subscriptions
- if (mSubscriptionsSupported) {
- r = queryPurchases(inv, ITEM_TYPE_SUBS);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying owned subscriptions).");
- }
-
- if (querySkuDetails) {
- r = querySkuDetails(ITEM_TYPE_SUBS, inv, moreSubsSkus);
- if (r != BILLING_RESPONSE_RESULT_OK) {
- throw new IabException(r, "Error refreshing inventory (querying prices of subscriptions).");
- }
- }
- }
-
- return inv;
- }
- catch (RemoteException e) {
- throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while refreshing inventory.", e);
- }
- catch (JSONException e) {
- throw new IabException(IABHELPER_BAD_RESPONSE, "Error parsing JSON response while refreshing inventory.", e);
- }
- }
-
- /**
- * Listener that notifies when an inventory query operation completes.
- */
- public interface QueryInventoryFinishedListener {
- /**
- * Called to notify that an inventory query operation completed.
- *
- * @param result The result of the operation.
- * @param inv The inventory.
- */
- void onQueryInventoryFinished(IabResult result, Inventory inv);
- }
-
-
- /**
- * Asynchronous wrapper for inventory query. This will perform an inventory
- * query as described in {@link #queryInventory}, but will do so asynchronously
- * and call back the specified listener upon completion. This method is safe to
- * call from a UI thread.
- *
- * @param querySkuDetails as in {@link #queryInventory}
- * @param moreItemSkus as in {@link #queryInventory}
- * @param moreSubsSkus as in {@link #queryInventory}
- * @param listener The listener to notify when the refresh operation completes.
- */
- public void queryInventoryAsync(final boolean querySkuDetails, final List<String> moreItemSkus,
- final List<String> moreSubsSkus, final QueryInventoryFinishedListener listener)
- throws IabAsyncInProgressException {
- final Handler handler = new Handler();
- checkNotDisposed();
- checkSetupDone("queryInventory");
- flagStartAsync("refresh inventory");
- (new Thread(new Runnable() {
- public void run() {
- IabResult result = new IabResult(BILLING_RESPONSE_RESULT_OK, "Inventory refresh successful.");
- Inventory inv = null;
- try {
- inv = queryInventory(querySkuDetails, moreItemSkus, moreSubsSkus);
- }
- catch (IabException ex) {
- result = ex.getResult();
- }
-
- flagEndAsync();
-
- final IabResult result_f = result;
- final Inventory inv_f = inv;
- if (!mDisposed && listener != null) {
- handler.post(new Runnable() {
- public void run() {
- listener.onQueryInventoryFinished(result_f, inv_f);
- }
- });
- }
- }
- })).start();
- }
-
- public void queryInventoryAsync(QueryInventoryFinishedListener listener)
- throws IabAsyncInProgressException{
- queryInventoryAsync(false, null, null, listener);
- }
-
- /**
- * Consumes a given in-app product. Consuming can only be done on an item
- * that's owned, and as a result of consumption, the user will no longer own it.
- * This method may block or take long to return. Do not call from the UI thread.
- * For that, see {@link #consumeAsync}.
- *
- * @param itemInfo The PurchaseInfo that represents the item to consume.
- * @throws IabException if there is a problem during consumption.
- */
- void consume(Purchase itemInfo) throws IabException {
- checkNotDisposed();
- checkSetupDone("consume");
-
- if (!itemInfo.mItemType.equals(ITEM_TYPE_INAPP)) {
- throw new IabException(IABHELPER_INVALID_CONSUMPTION,
- "Items of type '" + itemInfo.mItemType + "' can't be consumed.");
- }
-
- try {
- String token = itemInfo.getToken();
- String sku = itemInfo.getSku();
- if (token == null || token.equals("")) {
- logError("Can't consume "+ sku + ". No token.");
- throw new IabException(IABHELPER_MISSING_TOKEN, "PurchaseInfo is missing token for sku: "
- + sku + " " + itemInfo);
- }
-
- logDebug("Consuming sku: " + sku + ", token: " + token);
- int response = mService.consumePurchase(3, mContext.getPackageName(), token);
- if (response == BILLING_RESPONSE_RESULT_OK) {
- logDebug("Successfully consumed sku: " + sku);
- }
- else {
- logDebug("Error consuming consuming sku " + sku + ". " + getResponseDesc(response));
- throw new IabException(response, "Error consuming sku " + sku);
- }
- }
- catch (RemoteException e) {
- throw new IabException(IABHELPER_REMOTE_EXCEPTION, "Remote exception while consuming. PurchaseInfo: " + itemInfo, e);
- }
- }
-
- /**
- * Callback that notifies when a consumption operation finishes.
- */
- public interface OnConsumeFinishedListener {
- /**
- * Called to notify that a consumption has finished.
- *
- * @param purchase The purchase that was (or was to be) consumed.
- * @param result The result of the consumption operation.
- */
- void onConsumeFinished(Purchase purchase, IabResult result);
- }
-
- /**
- * Callback that notifies when a multi-item consumption operation finishes.
- */
- public interface OnConsumeMultiFinishedListener {
- /**
- * Called to notify that a consumption of multiple items has finished.
- *
- * @param purchases The purchases that were (or were to be) consumed.
- * @param results The results of each consumption operation, corresponding to each
- * sku.
- */
- void onConsumeMultiFinished(List<Purchase> purchases, List<IabResult> results);
- }
-
- /**
- * Asynchronous wrapper to item consumption. Works like {@link #consume}, but
- * performs the consumption in the background and notifies completion through
- * the provided listener. This method is safe to call from a UI thread.
- *
- * @param purchase The purchase to be consumed.
- * @param listener The listener to notify when the consumption operation finishes.
- */
- public void consumeAsync(Purchase purchase, OnConsumeFinishedListener listener)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("consume");
- List<Purchase> purchases = new ArrayList<Purchase>();
- purchases.add(purchase);
- consumeAsyncInternal(purchases, listener, null);
- }
-
- /**
- * Same as {@link #consumeAsync}, but for multiple items at once.
- * @param purchases The list of PurchaseInfo objects representing the purchases to consume.
- * @param listener The listener to notify when the consumption operation finishes.
- */
- public void consumeAsync(List<Purchase> purchases, OnConsumeMultiFinishedListener listener)
- throws IabAsyncInProgressException {
- checkNotDisposed();
- checkSetupDone("consume");
- consumeAsyncInternal(purchases, null, listener);
- }
-
- /**
- * Returns a human-readable description for the given response code.
- *
- * @param code The response code
- * @return A human-readable string explaining the result code.
- * It also includes the result code numerically.
- */
- public static String getResponseDesc(int code) {
- String[] iab_msgs = ("0:OK/1:User Canceled/2:Unknown/" +
- "3:Billing Unavailable/4:Item unavailable/" +
- "5:Developer Error/6:Error/7:Item Already Owned/" +
- "8:Item not owned").split("/");
- String[] iabhelper_msgs = ("0:OK/-1001:Remote exception during initialization/" +
- "-1002:Bad response received/" +
- "-1003:Purchase signature verification failed/" +
- "-1004:Send intent failed/" +
- "-1005:User cancelled/" +
- "-1006:Unknown purchase response/" +
- "-1007:Missing token/" +
- "-1008:Unknown error/" +
- "-1009:Subscriptions not available/" +
- "-1010:Invalid consumption attempt").split("/");
-
- if (code <= IABHELPER_ERROR_BASE) {
- int index = IABHELPER_ERROR_BASE - code;
- if (index >= 0 && index < iabhelper_msgs.length) return iabhelper_msgs[index];
- else return String.valueOf(code) + ":Unknown IAB Helper Error";
- }
- else if (code < 0 || code >= iab_msgs.length)
- return String.valueOf(code) + ":Unknown";
- else
- return iab_msgs[code];
- }
-
-
- // Checks that setup was done; if not, throws an exception.
- void checkSetupDone(String operation) {
- if (!mSetupDone) {
- logError("Illegal state for operation (" + operation + "): IAB helper is not set up.");
- throw new IllegalStateException("IAB helper is not set up. Can't perform operation: " + operation);
- }
- }
-
- // Workaround to bug where sometimes response codes come as Long instead of Integer
- int getResponseCodeFromBundle(Bundle b) {
- Object o = b.get(RESPONSE_CODE);
- if (o == null) {
- logDebug("Bundle with null response code, assuming OK (known issue)");
- return BILLING_RESPONSE_RESULT_OK;
- }
- else if (o instanceof Integer) return ((Integer)o).intValue();
- else if (o instanceof Long) return (int)((Long)o).longValue();
- else {
- logError("Unexpected type for bundle response code.");
- logError(o.getClass().getName());
- throw new RuntimeException("Unexpected type for bundle response code: " + o.getClass().getName());
- }
- }
-
- // Workaround to bug where sometimes response codes come as Long instead of Integer
- int getResponseCodeFromIntent(Intent i) {
- Object o = i.getExtras().get(RESPONSE_CODE);
- if (o == null) {
- logError("Intent with no response code, assuming OK (known issue)");
- return BILLING_RESPONSE_RESULT_OK;
- }
- else if (o instanceof Integer) return ((Integer)o).intValue();
- else if (o instanceof Long) return (int)((Long)o).longValue();
- else {
- logError("Unexpected type for intent response code.");
- logError(o.getClass().getName());
- throw new RuntimeException("Unexpected type for intent response code: " + o.getClass().getName());
- }
- }
-
- void flagStartAsync(String operation) throws IabAsyncInProgressException {
- synchronized (mAsyncInProgressLock) {
- if (mAsyncInProgress) {
- throw new IabAsyncInProgressException("Can't start async operation (" +
- operation + ") because another async operation (" + mAsyncOperation +
- ") is in progress.");
- }
- mAsyncOperation = operation;
- mAsyncInProgress = true;
- logDebug("Starting async operation: " + operation);
- }
- }
-
- void flagEndAsync() {
- synchronized (mAsyncInProgressLock) {
- logDebug("Ending async operation: " + mAsyncOperation);
- mAsyncOperation = "";
- mAsyncInProgress = false;
- if (mDisposeAfterAsync) {
- try {
- dispose();
- } catch (IabAsyncInProgressException e) {
- // Should not be thrown, because we reset mAsyncInProgress immediately before
- // calling dispose().
- }
- }
- }
- }
-
- /**
- * Exception thrown when the requested operation cannot be started because an async operation
- * is still in progress.
- */
- public static class IabAsyncInProgressException extends Exception {
- public IabAsyncInProgressException(String message) {
- super(message);
- }
- }
-
- int queryPurchases(Inventory inv, String itemType) throws JSONException, RemoteException {
- // Query purchases
- logDebug("Querying owned items, item type: " + itemType);
- logDebug("Package name: " + mContext.getPackageName());
- boolean verificationFailed = false;
- String continueToken = null;
-
- do {
- logDebug("Calling getPurchases with continuation token: " + continueToken);
- Bundle ownedItems = mService.getPurchases(3, mContext.getPackageName(),
- itemType, continueToken);
-
- int response = getResponseCodeFromBundle(ownedItems);
- logDebug("Owned items response: " + String.valueOf(response));
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logDebug("getPurchases() failed: " + getResponseDesc(response));
- return response;
- }
- if (!ownedItems.containsKey(RESPONSE_INAPP_ITEM_LIST)
- || !ownedItems.containsKey(RESPONSE_INAPP_PURCHASE_DATA_LIST)
- || !ownedItems.containsKey(RESPONSE_INAPP_SIGNATURE_LIST)) {
- logError("Bundle returned from getPurchases() doesn't contain required fields.");
- return IABHELPER_BAD_RESPONSE;
- }
-
- ArrayList<String> ownedSkus = ownedItems.getStringArrayList(
- RESPONSE_INAPP_ITEM_LIST);
- ArrayList<String> purchaseDataList = ownedItems.getStringArrayList(
- RESPONSE_INAPP_PURCHASE_DATA_LIST);
- ArrayList<String> signatureList = ownedItems.getStringArrayList(
- RESPONSE_INAPP_SIGNATURE_LIST);
-
- for (int i = 0; i < purchaseDataList.size(); ++i) {
- String purchaseData = purchaseDataList.get(i);
- String signature = signatureList.get(i);
- String sku = ownedSkus.get(i);
- if (Security.verifyPurchase(mSignatureBase64, purchaseData, signature)) {
- logDebug("Sku is owned: " + sku);
- Purchase purchase = new Purchase(itemType, purchaseData, signature);
-
- if (TextUtils.isEmpty(purchase.getToken())) {
- logWarn("BUG: empty/null token!");
- logDebug("Purchase data: " + purchaseData);
- }
-
- // Record ownership and token
- inv.addPurchase(purchase);
- }
- else {
- logWarn("Purchase signature verification **FAILED**. Not adding item.");
- logDebug(" Purchase data: " + purchaseData);
- logDebug(" Signature: " + signature);
- verificationFailed = true;
- }
- }
-
- continueToken = ownedItems.getString(INAPP_CONTINUATION_TOKEN);
- logDebug("Continuation token: " + continueToken);
- } while (!TextUtils.isEmpty(continueToken));
-
- return verificationFailed ? IABHELPER_VERIFICATION_FAILED : BILLING_RESPONSE_RESULT_OK;
- }
-
- int querySkuDetails(String itemType, Inventory inv, List<String> moreSkus)
- throws RemoteException, JSONException {
- logDebug("Querying SKU details.");
- ArrayList<String> skuList = new ArrayList<String>();
- skuList.addAll(inv.getAllOwnedSkus(itemType));
- if (moreSkus != null) {
- for (String sku : moreSkus) {
- if (!skuList.contains(sku)) {
- skuList.add(sku);
- }
- }
- }
-
- if (skuList.size() == 0) {
- logDebug("queryPrices: nothing to do because there are no SKUs.");
- return BILLING_RESPONSE_RESULT_OK;
- }
-
- // Split the sku list in blocks of no more than 20 elements.
- ArrayList<ArrayList<String>> packs = new ArrayList<ArrayList<String>>();
- ArrayList<String> tempList;
- int n = skuList.size() / 20;
- int mod = skuList.size() % 20;
- for (int i = 0; i < n; i++) {
- tempList = new ArrayList<String>();
- for (String s : skuList.subList(i * 20, i * 20 + 20)) {
- tempList.add(s);
- }
- packs.add(tempList);
- }
- if (mod != 0) {
- tempList = new ArrayList<String>();
- for (String s : skuList.subList(n * 20, n * 20 + mod)) {
- tempList.add(s);
- }
- packs.add(tempList);
- }
-
- for (ArrayList<String> skuPartList : packs) {
- Bundle querySkus = new Bundle();
- querySkus.putStringArrayList(GET_SKU_DETAILS_ITEM_LIST, skuPartList);
- Bundle skuDetails = mService.getSkuDetails(3, mContext.getPackageName(),
- itemType, querySkus);
-
- if (!skuDetails.containsKey(RESPONSE_GET_SKU_DETAILS_LIST)) {
- int response = getResponseCodeFromBundle(skuDetails);
- if (response != BILLING_RESPONSE_RESULT_OK) {
- logDebug("getSkuDetails() failed: " + getResponseDesc(response));
- return response;
- } else {
- logError("getSkuDetails() returned a bundle with neither an error nor a detail list.");
- return IABHELPER_BAD_RESPONSE;
- }
- }
-
- ArrayList<String> responseList = skuDetails.getStringArrayList(
- RESPONSE_GET_SKU_DETAILS_LIST);
-
- for (String thisResponse : responseList) {
- SkuDetails d = new SkuDetails(itemType, thisResponse);
- logDebug("Got sku details: " + d);
- inv.addSkuDetails(d);
- }
- }
-
- return BILLING_RESPONSE_RESULT_OK;
- }
-
- void consumeAsyncInternal(final List<Purchase> purchases,
- final OnConsumeFinishedListener singleListener,
- final OnConsumeMultiFinishedListener multiListener)
- throws IabAsyncInProgressException {
- final Handler handler = new Handler();
- flagStartAsync("consume");
- (new Thread(new Runnable() {
- public void run() {
- final List<IabResult> results = new ArrayList<IabResult>();
- for (Purchase purchase : purchases) {
- try {
- consume(purchase);
- results.add(new IabResult(BILLING_RESPONSE_RESULT_OK, "Successful consume of sku " + purchase.getSku()));
- }
- catch (IabException ex) {
- results.add(ex.getResult());
- }
- }
-
- flagEndAsync();
- if (!mDisposed && singleListener != null) {
- handler.post(new Runnable() {
- public void run() {
- singleListener.onConsumeFinished(purchases.get(0), results.get(0));
- }
- });
- }
- if (!mDisposed && multiListener != null) {
- handler.post(new Runnable() {
- public void run() {
- multiListener.onConsumeMultiFinished(purchases, results);
- }
- });
- }
- }
- })).start();
- }
-
- void logDebug(String msg) {
- if (mDebugLog) Log.d(mDebugTag, msg);
- }
-
- void logError(String msg) {
- Log.e(mDebugTag, "In-app billing error: " + msg);
- }
-
- void logWarn(String msg) {
- Log.w(mDebugTag, "In-app billing warning: " + msg);
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabResult.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabResult.java
deleted file mode 100644
index d26c8c3d..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabResult.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-/**
- * Represents the result of an in-app billing operation.
- * A result is composed of a response code (an integer) and possibly a
- * message (String). You can get those by calling
- * {@link #getResponse} and {@link #getMessage()}, respectively. You
- * can also inquire whether a result is a success or a failure by
- * calling {@link #isSuccess()} and {@link #isFailure()}.
- */
-public class IabResult {
- int mResponse;
- String mMessage;
-
- public IabResult(int response, String message) {
- mResponse = response;
- if (message == null || message.trim().length() == 0) {
- mMessage = IabHelper.getResponseDesc(response);
- }
- else {
- mMessage = message + " (response: " + IabHelper.getResponseDesc(response) + ")";
- }
- }
- public int getResponse() { return mResponse; }
- public String getMessage() { return mMessage; }
- public boolean isSuccess() { return mResponse == IabHelper.BILLING_RESPONSE_RESULT_OK; }
- public boolean isFailure() { return !isSuccess(); }
- public String toString() { return "IabResult: " + getMessage(); }
-}
-
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Inventory.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Inventory.java
deleted file mode 100644
index 9872613e..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Inventory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Represents a block of information about in-app items.
- * An Inventory is returned by such methods as {@link IabHelper#queryInventory}.
- */
-public class Inventory {
- Map<String,SkuDetails> mSkuMap = new HashMap<String,SkuDetails>();
- Map<String,Purchase> mPurchaseMap = new HashMap<String,Purchase>();
-
- Inventory() { }
-
- /** Returns the listing details for an in-app product. */
- public SkuDetails getSkuDetails(String sku) {
- return mSkuMap.get(sku);
- }
-
- /** Returns purchase information for a given product, or null if there is no purchase. */
- public Purchase getPurchase(String sku) {
- return mPurchaseMap.get(sku);
- }
-
- /** Returns whether or not there exists a purchase of the given product. */
- public boolean hasPurchase(String sku) {
- return mPurchaseMap.containsKey(sku);
- }
-
- /** Return whether or not details about the given product are available. */
- public boolean hasDetails(String sku) {
- return mSkuMap.containsKey(sku);
- }
-
- /**
- * Erase a purchase (locally) from the inventory, given its product ID. This just
- * modifies the Inventory object locally and has no effect on the server! This is
- * useful when you have an existing Inventory object which you know to be up to date,
- * and you have just consumed an item successfully, which means that erasing its
- * purchase data from the Inventory you already have is quicker than querying for
- * a new Inventory.
- */
- public void erasePurchase(String sku) {
- if (mPurchaseMap.containsKey(sku)) mPurchaseMap.remove(sku);
- }
-
- /** Returns a list of all owned product IDs. */
- List<String> getAllOwnedSkus() {
- return new ArrayList<String>(mPurchaseMap.keySet());
- }
-
- /** Returns a list of all owned product IDs of a given type */
- List<String> getAllOwnedSkus(String itemType) {
- List<String> result = new ArrayList<String>();
- for (Purchase p : mPurchaseMap.values()) {
- if (p.getItemType().equals(itemType)) result.add(p.getSku());
- }
- return result;
- }
-
- /** Returns a list of all purchases. */
- List<Purchase> getAllPurchases() {
- return new ArrayList<Purchase>(mPurchaseMap.values());
- }
-
- void addSkuDetails(SkuDetails d) {
- mSkuMap.put(d.getSku(), d);
- }
-
- void addPurchase(Purchase p) {
- mPurchaseMap.put(p.getSku(), p);
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Purchase.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Purchase.java
deleted file mode 100644
index 49aeffba..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Purchase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents an in-app billing purchase.
- */
-public class Purchase {
- String mItemType; // ITEM_TYPE_INAPP or ITEM_TYPE_SUBS
- String mOrderId;
- String mPackageName;
- String mSku;
- long mPurchaseTime;
- int mPurchaseState;
- String mDeveloperPayload;
- String mToken;
- String mOriginalJson;
- String mSignature;
- boolean mIsAutoRenewing;
-
- public Purchase(String itemType, String jsonPurchaseInfo, String signature) throws JSONException {
- mItemType = itemType;
- mOriginalJson = jsonPurchaseInfo;
- JSONObject o = new JSONObject(mOriginalJson);
- mOrderId = o.optString("orderId");
- mPackageName = o.optString("packageName");
- mSku = o.optString("productId");
- mPurchaseTime = o.optLong("purchaseTime");
- mPurchaseState = o.optInt("purchaseState");
- mDeveloperPayload = o.optString("developerPayload");
- mToken = o.optString("token", o.optString("purchaseToken"));
- mIsAutoRenewing = o.optBoolean("autoRenewing");
- mSignature = signature;
- }
-
- public String getItemType() { return mItemType; }
- public String getOrderId() { return mOrderId; }
- public String getPackageName() { return mPackageName; }
- public String getSku() { return mSku; }
- public long getPurchaseTime() { return mPurchaseTime; }
- public int getPurchaseState() { return mPurchaseState; }
- public String getDeveloperPayload() { return mDeveloperPayload; }
- public String getToken() { return mToken; }
- public String getOriginalJson() { return mOriginalJson; }
- public String getSignature() { return mSignature; }
- public boolean isAutoRenewing() { return mIsAutoRenewing; }
-
- @Override
- public String toString() { return "PurchaseInfo(type:" + mItemType + "):" + mOriginalJson; }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Security.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Security.java
deleted file mode 100644
index ba10e695..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/Security.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import android.text.TextUtils;
-import android.util.Base64;
-import android.util.Log;
-
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-
-/**
- * Security-related methods. For a secure implementation, all of this code
- * should be implemented on a server that communicates with the
- * application on the device. For the sake of simplicity and clarity of this
- * example, this code is included here and is executed on the device. If you
- * must verify the purchases on the phone, you should obfuscate this code to
- * make it harder for an attacker to replace the code with stubs that treat all
- * purchases as verified.
- */
-public class Security {
- private static final String TAG = "IABUtil/Security";
-
- private static final String KEY_FACTORY_ALGORITHM = "RSA";
- private static final String SIGNATURE_ALGORITHM = "SHA1withRSA";
-
- /**
- * Verifies that the data was signed with the given signature, and returns
- * the verified purchase. The data is in JSON format and signed
- * with a private key. The data also contains the {@link PurchaseState}
- * and product ID of the purchase.
- * @param base64PublicKey the base64-encoded public key to use for verifying.
- * @param signedData the signed JSON string (signed, not encrypted)
- * @param signature the signature for the data, signed with the private key
- */
- public static boolean verifyPurchase(String base64PublicKey, String signedData, String signature) {
- if (TextUtils.isEmpty(signedData) || TextUtils.isEmpty(base64PublicKey) ||
- TextUtils.isEmpty(signature)) {
- Log.e(TAG, "Purchase verification failed: missing data.");
- return false;
- }
-
- PublicKey key = Security.generatePublicKey(base64PublicKey);
- return Security.verify(key, signedData, signature);
- }
-
- /**
- * Generates a PublicKey instance from a string containing the
- * Base64-encoded public key.
- *
- * @param encodedPublicKey Base64-encoded public key
- * @throws IllegalArgumentException if encodedPublicKey is invalid
- */
- public static PublicKey generatePublicKey(String encodedPublicKey) {
- try {
- byte[] decodedKey = Base64.decode(encodedPublicKey, Base64.DEFAULT);
- KeyFactory keyFactory = KeyFactory.getInstance(KEY_FACTORY_ALGORITHM);
- return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException(e);
- } catch (InvalidKeySpecException e) {
- Log.e(TAG, "Invalid key specification.");
- throw new IllegalArgumentException(e);
- }
- }
-
- /**
- * Verifies that the signature from the server matches the computed
- * signature on the data. Returns true if the data is correctly signed.
- *
- * @param publicKey public key associated with the developer account
- * @param signedData signed data from server
- * @param signature server signature
- * @return true if the data and signature match
- */
- public static boolean verify(PublicKey publicKey, String signedData, String signature) {
- byte[] signatureBytes;
- try {
- signatureBytes = Base64.decode(signature, Base64.DEFAULT);
- } catch (IllegalArgumentException e) {
- Log.e(TAG, "Base64 decoding failed.");
- return false;
- }
- try {
- Signature sig = Signature.getInstance(SIGNATURE_ALGORITHM);
- sig.initVerify(publicKey);
- sig.update(signedData.getBytes());
- if (!sig.verify(signatureBytes)) {
- Log.e(TAG, "Signature verification failed.");
- return false;
- }
- return true;
- } catch (NoSuchAlgorithmException e) {
- Log.e(TAG, "NoSuchAlgorithmException.");
- } catch (InvalidKeyException e) {
- Log.e(TAG, "Invalid key specification.");
- } catch (SignatureException e) {
- Log.e(TAG, "Signature exception.");
- }
- return false;
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/SkuDetails.java b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/SkuDetails.java
deleted file mode 100644
index 52b32bca..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/SkuDetails.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (c) 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.pitchedapps.frost.utils.iab;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Represents an in-app product's listing details.
- */
-public class SkuDetails {
- private final String mItemType;
- private final String mSku;
- private final String mType;
- private final String mPrice;
- private final long mPriceAmountMicros;
- private final String mPriceCurrencyCode;
- private final String mTitle;
- private final String mDescription;
- private final String mJson;
-
- public SkuDetails(String jsonSkuDetails) throws JSONException {
- this(IabHelper.ITEM_TYPE_INAPP, jsonSkuDetails);
- }
-
- public SkuDetails(String itemType, String jsonSkuDetails) throws JSONException {
- mItemType = itemType;
- mJson = jsonSkuDetails;
- JSONObject o = new JSONObject(mJson);
- mSku = o.optString("productId");
- mType = o.optString("type");
- mPrice = o.optString("price");
- mPriceAmountMicros = o.optLong("price_amount_micros");
- mPriceCurrencyCode = o.optString("price_currency_code");
- mTitle = o.optString("title");
- mDescription = o.optString("description");
- }
-
- public String getSku() { return mSku; }
- public String getType() { return mType; }
- public String getPrice() { return mPrice; }
- public long getPriceAmountMicros() { return mPriceAmountMicros; }
- public String getPriceCurrencyCode() { return mPriceCurrencyCode; }
- public String getTitle() { return mTitle; }
- public String getDescription() { return mDescription; }
-
- @Override
- public String toString() {
- return "SkuDetails:" + mJson;
- }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index 5186b46c..dc5ac6ac 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -12,9 +12,7 @@ import ca.allanwang.kau.utils.toDrawable
import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.load.resource.bitmap.CircleCrop
import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.request.target.Target
import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.pitchedapps.frost.R
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
index b856f973..367495b5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
@@ -4,7 +4,6 @@ import android.content.Context
import android.support.v4.view.ViewPager
import android.util.AttributeSet
import android.view.MotionEvent
-import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.Prefs
/**
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index 3f976fb8..13f1ac90 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -2,8 +2,6 @@ package com.pitchedapps.frost.web
import android.content.Context
import android.webkit.JavascriptInterface
-import ca.allanwang.kau.utils.startActivity
-import com.pitchedapps.frost.activities.ImageActivity
import com.pitchedapps.frost.activities.MainActivity
import com.pitchedapps.frost.dbflow.CookieModel
import com.pitchedapps.frost.facebook.formattedFbUrl
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index d7a2db0a..b23d898e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -4,7 +4,10 @@ import android.annotation.SuppressLint
import android.content.Context
import android.util.AttributeSet
import android.view.View
-import android.webkit.*
+import android.webkit.ConsoleMessage
+import android.webkit.CookieManager
+import android.webkit.WebChromeClient
+import android.webkit.WebView
import ca.allanwang.kau.utils.fadeIn
import com.pitchedapps.frost.R
import com.pitchedapps.frost.dbflow.CookieModel
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/SearchWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/SearchWebView.kt
index 325d0333..05d56f92 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/SearchWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/SearchWebView.kt
@@ -2,7 +2,6 @@ package com.pitchedapps.frost.web
import android.annotation.SuppressLint
import android.content.Context
-import android.view.View
import android.webkit.JavascriptInterface
import android.webkit.WebView
import ca.allanwang.kau.searchview.SearchItem
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7ab8ef0..9e62e734 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,7 +54,7 @@
<string name="uh_oh">Uh Oh</string>
<string name="reload">Reload</string>
<string name="play_store_not_pro">It seems like you are a pro user, but we couldn\'t find your purchasing info. If this error persists, please try clearing the Play Store cache and reinstalling the app.</string>
- <string name="play_store_not_found">This app doesn\'t seem to be installed from the Play Store. Please reinstall if this is an issue.</string>
+ <string name="play_store_unsupported">It seems like app version can\'t purchase pro. Please reinstall from the play store if this is a persisting issue.</string>
<string name="play_store_not_found_pro_query">This is a pro feature, but this app doesn\'t seem to be installed from the Play Store. Please reinstall if this is an issue.</string>
<string name="play_store_billing_error">Something went wrong. Please try again later.</string>
<string name="play_thank_you">Thank you!</string>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 3c60ef5c..7964c0e9 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -9,7 +9,7 @@
-->
<version title="Beta Updates" />
-
+
<item text="Fix regex bug for some devices" />
<item text="Fix notification text" />
<item text="Update round icons" />
@@ -25,7 +25,7 @@
<item text="Start filtering out unnecessary loads" />
<item text="Fix notification duplicates" />
<item text="Fix long pressing album images" />
- <item text="Add friend request tab in nav bar" />
+ <item text="Add friend request tab in nav bar" />
<item text="Aggressively filter nonrecent posts in recents mode" />
<item text="Add download option for full sized images" />
<item text="Fix rounded icons" />