Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue when free app was previously installed.

This commit is contained in:
tom79 2019-07-16 09:42:11 +02:00
parent e43d8ed9d1
commit 110e5c3753
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -326,7 +326,7 @@
/>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="app.fedilab.android.fileProvider"
android:authorities="${applicationId}.fileProvider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data

25
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -1013,9 +1013,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
}
// Continue only if the File was successfully created
if (photoFile != null) {
photoFileUri = FileProvider.getUriForFile(this,
"app.fedilab.android.fileProvider",
photoFile);
if(BuildConfig.DONATIONS) {
photoFileUri = FileProvider.getUriForFile(this,
"fr.gouv.etalab.mastodon.fileProvider",
photoFile);
}else{
photoFileUri = FileProvider.getUriForFile(this,
"app.fedilab.android.fileProvider",
photoFile);
}
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoFileUri);
startActivityForResult(takePictureIntent, TAKE_PHOTO);
}
@ -2538,9 +2545,15 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
while ((read = tempInput.read(buff)) > 0) {
tempOut.write(buff, 0, read);
}
uri = FileProvider.getUriForFile(this,
"app.fedilab.android.fileProvider",
file);
if(BuildConfig.DONATIONS) {
uri = FileProvider.getUriForFile(this,
"fr.gouv.etalab.mastodon.fileProvider",
file);
}else{
uri = FileProvider.getUriForFile(this,
"app.fedilab.android.fileProvider",
file);
}
tempInput.close();
tempOut.close();
} catch(IOException e) {