fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle open_documet_tree activityresult in shared simpleactivity

This commit is contained in:
tibbi 2016-11-06 19:53:02 +01:00
parent fb59224405
commit c71f94d9ec
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
View File

@ -1,7 +1,5 @@
package com.simplemobiletools.gallery.activities; package com.simplemobiletools.gallery.activities;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
@ -238,21 +236,10 @@ public class ViewPagerActivity extends SimpleActivity
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
Utils.Companion.showToast(getApplicationContext(), R.string.wallpaper_set_successfully); Utils.Companion.showToast(getApplicationContext(), R.string.wallpaper_set_successfully);
} }
} else if (requestCode == Constants.OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && data != null) {
saveTreeUri(data);
} }
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
} }
@TargetApi(Build.VERSION_CODES.KITKAT)
private void saveTreeUri(Intent resultData) {
Uri treeUri = resultData.getData();
getConfig().setTreeUri(resultData.getData().toString());
int takeFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
getContentResolver().takePersistableUriPermission(treeUri, takeFlags);
}
private void shareMedium() { private void shareMedium() {
final Medium medium = getCurrentMedium(); final Medium medium = getCurrentMedium();
Utils.Companion.shareMedium(medium, this); Utils.Companion.shareMedium(medium, this);

7
app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
View File

@ -137,13 +137,6 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
}) })
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == Constants.OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
Utils.saveTreeUri(this, resultData)
}
}
private fun getCompressionFormat(file: File): Bitmap.CompressFormat { private fun getCompressionFormat(file: File): Bitmap.CompressFormat {
return when (file.extension.toLowerCase()) { return when (file.extension.toLowerCase()) {
"png" -> Bitmap.CompressFormat.PNG "png" -> Bitmap.CompressFormat.PNG

12
app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt
View File

@ -1,11 +1,14 @@
package com.simplemobiletools.gallery.activities package com.simplemobiletools.gallery.activities
import android.app.Activity
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.view.MenuItem import android.view.MenuItem
import com.simplemobiletools.gallery.Config import com.simplemobiletools.gallery.Config
import com.simplemobiletools.gallery.Constants
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.Utils
open class SimpleActivity : AppCompatActivity() { open class SimpleActivity : AppCompatActivity() {
lateinit var config: Config lateinit var config: Config
@ -29,4 +32,11 @@ open class SimpleActivity : AppCompatActivity() {
else -> super.onOptionsItemSelected(item) else -> super.onOptionsItemSelected(item)
} }
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == Constants.OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
Utils.saveTreeUri(this, resultData)
}
}
} }