Merge pull request #731 from chandevel/feature/updater-pie

Fix auto updater on pie
fix-travis
Florens 6 years ago committed by GitHub
commit f511b43d94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      Clover/app/src/main/AndroidManifest.xml
  2. 12
      Clover/app/src/main/java/org/floens/chan/ui/helper/VersionHandler.java

@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission
android:name="android.permission.WAKE_LOCK"
tools:node="replace" />

@ -25,7 +25,9 @@ import android.content.Intent;
import android.support.v7.app.AlertDialog;
import android.text.Html;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.widget.Button;
import android.widget.TextView;
import org.floens.chan.BuildConfig;
import org.floens.chan.R;
@ -37,6 +39,8 @@ import org.floens.chan.utils.Logger;
import java.io.File;
import static org.floens.chan.utils.AndroidUtils.dp;
public class VersionHandler implements UpdateManager.UpdateCallback {
private static final String TAG = "VersionHandler";
@ -145,8 +149,13 @@ public class VersionHandler implements UpdateManager.UpdateCallback {
public void showUpdateAvailableDialog(final UpdateApiRequest.UpdateApiMessage message) {
Spanned text = Html.fromHtml(message.messageHtml);
TextView textView = new TextView(context);
textView.setMovementMethod(LinkMovementMethod.getInstance());
textView.setPadding(dp(16), dp(16), dp(16), dp(16));
textView.setText(text);
final AlertDialog dialog = new AlertDialog.Builder(context)
.setMessage(text)
.setView(textView)
.setNegativeButton(R.string.update_later, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@ -160,6 +169,7 @@ public class VersionHandler implements UpdateManager.UpdateCallback {
}
})
.create();
dialog.show();
dialog.setCanceledOnTouchOutside(false);
}

Loading…
Cancel
Save