diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-10-22 07:38:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-22 07:38:29 +0200 |
| commit | ee24c39fcab37751ec60834e24be3ab5ae229271 (patch) | |
| tree | d7d36efbe7681e156d26a3670cda90e57206c973 | |
| parent | 325c46715daa69605c9646f33ce577a246106ca2 (diff) | |
| parent | 82d4dacb117d59fec99f0fa08eaeeaa7af76bf8f (diff) | |
| download | AntennaPod-ee24c39fcab37751ec60834e24be3ab5ae229271.zip | |
Merge pull request #2461 from ByteHamster/fix-debug-provider
Fix install of debug version by using unique provider
| -rw-r--r-- | app/build.gradle | 1 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 2 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java | 4 | ||||
| -rw-r--r-- | core/src/main/res/values/strings.xml | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle index 222c34dda..807cea127 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,6 +72,7 @@ android { debug { applicationIdSuffix ".debug" + resValue "string", "provider_authority", "de.danoeh.antennapod.debug.provider" buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e7938682e..d8c1ab137 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -373,7 +373,7 @@ </receiver> <provider - android:authorities="de.danoeh.antennapod.provider" + android:authorities="@string/provider_authority" android:name="android.support.v4.content.FileProvider" android:exported="false" android:grantUriPermissions="true"> diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 1e396b8a8..1ca0d0109 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -454,7 +454,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc emailIntent.putExtra(Intent.EXTRA_SUBJECT, "AntennaPod Crash Report"); emailIntent.putExtra(Intent.EXTRA_TEXT, "Please describe what you were doing when the app crashed"); // the attachment - Uri fileUri = FileProvider.getUriForFile(context, "de.danoeh.antennapod.provider", + Uri fileUri = FileProvider.getUriForFile(context, context.getString(R.string.provider_authority), CrashReportWriter.getFile()); emailIntent.putExtra(Intent.EXTRA_STREAM, fileUri); emailIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java index 343b4dc3b..001bd6a2c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java @@ -72,7 +72,7 @@ public class ShareUtils { public static void shareFeedItemFile(Context context, FeedMedia media) { Intent i = new Intent(Intent.ACTION_SEND); i.setType(media.getMime_type()); - Uri fileUri = FileProvider.getUriForFile(context, "de.danoeh.antennapod.provider", + Uri fileUri = FileProvider.getUriForFile(context, context.getString(R.string.provider_authority), new File(media.getLocalMediaUrl())); i.putExtra(Intent.EXTRA_STREAM, fileUri); i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); @@ -84,6 +84,6 @@ public class ShareUtils { } } context.startActivity(Intent.createChooser(i, context.getString(R.string.share_file_label))); - Log.e(TAG, "Foo"); + Log.e(TAG, "shareFeedItemFile called"); } } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 7648f8867..a940c031b 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ <!-- Activitiy and fragment titles --> <string name="app_name" translate="false">AntennaPod</string> + <string name="provider_authority" translate="false">de.danoeh.antennapod.provider</string> <string name="feeds_label">Feeds</string> <string name="statistics_label">Statistics</string> <string name="add_feed_label">Add Podcast</string> |