Skip to content
This repository was archived by the owner on Dec 28, 2022. It is now read-only.

Commit 036dbba

Browse files
committed
Remove 'upgrade to pro' (Shuttle is now free)
1 parent b381433 commit 036dbba

File tree

61 files changed

+42
-865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+42
-865
lines changed

.idea/compiler.xml

+1-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+10-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ android {
5555
}
5656

5757
compileSdkVersion Dependencies.compileSdk
58-
buildToolsVersion Dependencies.buildTools
5958

6059
defaultConfig {
6160
minSdkVersion Dependencies.minSdk
@@ -270,7 +269,6 @@ dependencies {
270269
implementation Dependencies.materialDialogs
271270
implementation Dependencies.materialDialogCommons
272271
implementation Dependencies.expandableRecyclerView
273-
implementation Dependencies.billing
274272

275273
implementation Dependencies.butterknife
276274
kapt Dependencies.butterknifeAnnotationProcessor

app/src/main/java/com/simplecity/amp_library/ShuttleApplication.java

-14
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,13 @@
3535
import com.simplecity.amp_library.sql.databases.CustomArtworkTable;
3636
import com.simplecity.amp_library.sql.providers.PlayCountTable;
3737
import com.simplecity.amp_library.sql.sqlbrite.SqlBriteUtils;
38-
import com.simplecity.amp_library.utils.AnalyticsManager;
3938
import com.simplecity.amp_library.utils.DataManager;
4039
import com.simplecity.amp_library.utils.InputMethodManagerLeaks;
41-
import com.simplecity.amp_library.utils.LegacyUtils;
4240
import com.simplecity.amp_library.utils.LogUtils;
4341
import com.simplecity.amp_library.utils.SettingsManager;
4442
import com.simplecity.amp_library.utils.StringUtils;
4543
import com.squareup.leakcanary.LeakCanary;
4644
import com.squareup.leakcanary.RefWatcher;
47-
import hu.akarnokd.rxjava2.debug.RxJavaAssemblyTracking;
4845
import io.fabric.sdk.android.Fabric;
4946
import io.reactivex.Completable;
5047
import io.reactivex.Observable;
@@ -78,8 +75,6 @@ public static synchronized ShuttleApplication getInstance() {
7875
return instance;
7976
}
8077

81-
private boolean isUpgraded;
82-
8378
public static final double VOLUME_INCREMENT = 0.05;
8479

8580
private RefWatcher refWatcher;
@@ -203,15 +198,6 @@ public static String getVersion() {
203198
return "unknown";
204199
}
205200

206-
public void setIsUpgraded(boolean isUpgraded) {
207-
this.isUpgraded = isUpgraded;
208-
AnalyticsManager.setIsUpgraded();
209-
}
210-
211-
public boolean getIsUpgraded() {
212-
return isUpgraded || BuildConfig.DEBUG;
213-
}
214-
215201
public static File getDiskCacheDir(String uniqueName) {
216202
try {
217203
// Check if media is mounted or storage is built-in, if so, try and use external cache dir

app/src/main/java/com/simplecity/amp_library/billing/BillingManager.java

-171
This file was deleted.

app/src/main/java/com/simplecity/amp_library/constants/Config.java

-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ private Config() {
1414
public static final String PACKAGE_NAME_PRO = "com.simplecity.amp_pro";
1515

1616
public static final String CHROMECAST_APP_ID = "73341C53";
17-
18-
// IAP
19-
public static final String SKU_PREMIUM = "id_upgrade_to_pro";
2017
}

app/src/main/java/com/simplecity/amp_library/playback/ChromecastManager.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ class ChromecastManager {
5757
}
5858

5959
void init() {
60-
if (ShuttleUtils.isUpgraded()) {
61-
castManager = VideoCastManager.getInstance();
62-
setupCastListener();
63-
castManager.addVideoCastConsumer(castConsumer);
64-
}
60+
castManager = VideoCastManager.getInstance();
61+
setupCastListener();
62+
castManager.addVideoCastConsumer(castConsumer);
6563

6664
if (castManager != null && castManager.isConnected()) {
6765
updatePlaybackLocation(PlaybackManager.PlaybackLocation.REMOTE);

app/src/main/java/com/simplecity/amp_library/playback/PlaybackManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public void stop(boolean goToIdle) {
652652
Log.e(TAG, e.toString());
653653
}
654654
if (goToIdle) {
655-
if (ShuttleUtils.isUpgraded() && chromecastManager.castManager != null) {
655+
if (chromecastManager.castManager != null) {
656656
HttpServer.getInstance().stop();
657657
}
658658
setIsSupposedToBePlaying(false, false);

app/src/main/java/com/simplecity/amp_library/search/SearchFragment.java

-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import com.simplecity.amp_library.ui.detail.album.AlbumDetailFragment;
4040
import com.simplecity.amp_library.ui.detail.artist.ArtistDetailFragment;
4141
import com.simplecity.amp_library.ui.dialog.DeleteDialog;
42-
import com.simplecity.amp_library.ui.dialog.UpgradeDialog;
4342
import com.simplecity.amp_library.ui.fragments.BaseFragment;
4443
import com.simplecity.amp_library.ui.modelviews.AlbumArtistView;
4544
import com.simplecity.amp_library.ui.modelviews.AlbumView;
@@ -350,11 +349,6 @@ public void goToAlbum(Album album, View transitionView) {
350349
searchView.getHandler().postDelayed(() -> pushDetailFragment(AlbumDetailFragment.newInstance(album, transitionName), transitionView), 50);
351350
}
352351

353-
@Override
354-
public void showUpgradeDialog() {
355-
UpgradeDialog.getUpgradeDialog(getActivity()).show();
356-
}
357-
358352
void pushDetailFragment(Fragment fragment, @Nullable View transitionView) {
359353

360354
List<Pair<View, String>> transitions = new ArrayList<>();

app/src/main/java/com/simplecity/amp_library/search/SearchView.java

-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,4 @@ public interface SearchView {
2828
void goToArtist(AlbumArtist albumArtist, View transitionView);
2929

3030
void goToAlbum(Album album, View transitionView);
31-
32-
void showUpgradeDialog();
3331
}

0 commit comments

Comments
 (0)