Skip to content

Commit

Permalink
Merge branch 'release/1_07_final'
Browse files Browse the repository at this point in the history
  • Loading branch information
abarisain committed Dec 1, 2014
2 parents c3913da + 499bb67 commit 299d9e0
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 2 deletions.
4 changes: 2 additions & 2 deletions MPDroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
versionCode 52
versionName "1.07 RC4 " + gitShortHash()
versionCode 53
versionName "1.07 Final" + gitShortHash()
}

lintOptions {
Expand Down
10 changes: 10 additions & 0 deletions MPDroid/src/main/java/com/namelessdev/mpdroid/MPDApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.a0z.mpd.MPDStatusMonitor;

import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Application;
Expand Down Expand Up @@ -397,6 +398,15 @@ public final boolean isTabletUiEnabled() {
&& mSettings.getBoolean("tabletUI", true);
}

public final boolean shouldDisplayGooglePlayDeathWarning() {
return !mSettings.getBoolean("googlePlayDeathWarningShown", false);
}

@SuppressLint("CommitPrefEdits")
public final void markGooglePlayDeathWarningAsRead() {
mSettings.edit().putBoolean("googlePlayDeathWarningShown", true).commit();
}

/**
* Called upon connection configuration change.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@

import android.app.ActionBar;
import android.app.ActionBar.OnNavigationListener;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
Expand Down Expand Up @@ -471,6 +474,20 @@ public void onConfigurationChanged(final Configuration newConfig) {
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

if (mApp.shouldDisplayGooglePlayDeathWarning()) {
new AlertDialog.Builder(this)
.setTitle(getString(R.string.gpDeathTitle))
.setMessage(getResources().getString(R.string.gpDeathMessage))
.setNegativeButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
@Override
public void onClick(final DialogInterface dialogInterface, final int i) {
mApp.markGooglePlayDeathWarningAsRead();
}
})
.setCancelable(false)
.show();
}

mApp.setupServiceBinder();

if (mApp.isTabletUiEnabled()) {
Expand Down
4 changes: 4 additions & 0 deletions MPDroid/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,8 @@
<string name="mediaPlayerErrorTimedOut">Operation timed out.</string>
<string name="mediaPlayerErrorUnsupported">Media framework does not support stream codec.</string>
<!-- End MediaPlayer Error Strings -->

<string name="gpDeathTitle">Please read</string>
<string name="gpDeathMessage">It is with great disappointment that I\'m using this space to announce that Google made the harsh decision to remove MPDroid from the Play Store.\n\nIf they remove it, as they told me they will, 1.07 will be the last update you will get automatically from the Play Store.\n\nFor information, Google removed MPDroid for \'Copyright infringement\' without telling us what we did wrong, and we lost the appeal without being able to speak to a human.\n\nI have not decided yet if I will continue maintaining MPDroid or not, but it will still be available for download in F-Droid and at http://github.com/abarisain/dmix . More info, please go to http://nlss.fr/mpdroid . I will put an explanation page and a form so that I can update you about MPDroid\'s future via email, if you want.\n\nThanks for your time, and please enjoy this release we\'ve worked really hard on !</string>

</resources>

0 comments on commit 299d9e0

Please sign in to comment.