summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2018-04-07 17:49:24 +0200
committerGitHub <noreply@github.com>2018-04-07 17:49:24 +0200
commitccd29a9991ad271bfad2e7d911437805b5047552 (patch)
tree12e461676bbc585dbd36474c69a40c9ad0f72156 /app/src/main/java/de/danoeh/antennapod
parentc5e99c92b3e33c24983bacd63897681d4d7fe179 (diff)
parent0f9fe833bcb129155f5b76138e6c748de17ab591 (diff)
downloadAntennaPod-ccd29a9991ad271bfad2e7d911437805b5047552.zip
Merge pull request #2618 from hannesa2/AndroidStudio_3.1
update to AndroidStudio 3.1
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
index d9c250b38..26352f58f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java
@@ -4,7 +4,7 @@ package de.danoeh.antennapod.activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -21,7 +21,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
/** Guides the user through the authentication process */
-public class FlattrAuthActivity extends ActionBarActivity {
+public class FlattrAuthActivity extends AppCompatActivity {
private static final String TAG = "FlattrAuthActivity";
private TextView txtvExplanation;