-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* dev: (22 commits) update whatsnew for v3.1.0 release minor fix for PurchaseEvent in Timetable adapter add response caching and offline caching for verfiy api Timetable: update TimetableAdapter on purchase event remove references to ads until they are implemented Pro mode: unpersonalise pref strings update travis.yml revert back to the public API url and add a test add offline response caching for okHttp Rxify BillingManager with server side purchase verification implement IAP for ProKey with infinite retry for billingclient seperatly handle client and server network errors use a static summary for night theme and hide weekends pref add initial donation/pro mode preference remove timetable notification preference LoggingInterceptor: log out status code optout of GA on Debug build gradle: update support libraries invert show weekends preference fix scrolling to date when weekends are disabled ...
- Loading branch information
Showing
52 changed files
with
1,045 additions
and
1,971 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # OkHttp | ||
| -keepattributes Signature | ||
| -keepattributes *Annotation* | ||
| -keep class okhttp3.** { *; } | ||
| -keep interface okhttp3.** { *; } | ||
| -dontwarn okhttp3.** | ||
| -dontwarn okhttp3.** | ||
| -dontwarn okio.** | ||
| -dontwarn javax.annotation.** | ||
| -dontwarn org.conscrypt.** | ||
| # A resource is loaded with a relative path so the package of this class must be preserved. | ||
| -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
192 changes: 0 additions & 192 deletions
192
app/src/main/aidl/com/android/vending/billing/IInAppBillingService.aidl
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
app/src/main/java/com/shalzz/attendance/billing/BillingConstants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2017 Google Inc. All Rights Reserved. | ||
| * | ||
| * 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.shalzz.attendance.billing; | ||
|
|
||
| import com.android.billingclient.api.BillingClient; | ||
| import com.android.billingclient.api.BillingClient.SkuType; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Static fields and methods useful for billing | ||
| */ | ||
| public final class BillingConstants { | ||
| // SKUs for our products: the premium upgrade (non-consumable) and gas (consumable) | ||
| public static final String SKU_PRO_KEY = "pro_key"; | ||
| public static final String SKU_DONATION_200 = "donation_200"; | ||
| public static final String SKU_DONATION_250 = "donation_250"; | ||
|
|
||
| // SKU for our subscription | ||
|
|
||
| private static final String[] IN_APP_SKUS = {SKU_PRO_KEY, SKU_DONATION_200, SKU_DONATION_250}; | ||
| private static final String[] SUBSCRIPTIONS_SKUS = {}; | ||
|
|
||
| private BillingConstants(){} | ||
|
|
||
| /** | ||
| * Returns the list of all SKUs for the billing type specified | ||
| */ | ||
| public static final List<String> getSkuList(@BillingClient.SkuType String billingType) { | ||
| return (billingType == SkuType.INAPP) ? Arrays.asList(IN_APP_SKUS) | ||
| : Arrays.asList(SUBSCRIPTIONS_SKUS); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.