fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating gradle, commons

Browse Source
This commit is contained in:
tibbi
2019-04-07 23:10:01 +02:00
parent d941b1d9a5
commit 34d9b27367
5 changed files with 7 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
View File

@ -27,7 +27,6 @@ class SettingsActivity : SimpleActivity() {
setupPurchaseThankYou()
setupCustomizeColors()
setupUseEnglish()
setupAvoidWhatsNew()
setupSound()
setupFocusBeforeCapture()
setupVolumeButtonsAsShutter()
@ -85,14 +84,6 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupAvoidWhatsNew() {
settings_avoid_whats_new.isChecked = config.avoidWhatsNew
settings_avoid_whats_new_holder.setOnClickListener {
settings_avoid_whats_new.toggle()
config.avoidWhatsNew = settings_avoid_whats_new.isChecked
}
}
private fun launchAbout() {
val licenses = LICENSE_GLIDE
@ -177,8 +168,9 @@ class SettingsActivity : SimpleActivity() {
settings_save_photos.text = getLastPart(config.savePhotosFolder)
settings_save_photos_holder.setOnClickListener {
FilePickerDialog(this, config.savePhotosFolder, false, showFAB = true) {
val path = it
handleSAFDialog(it) {
config.savePhotosFolder = it
config.savePhotosFolder = path
settings_save_photos.text = getLastPart(config.savePhotosFolder)
}
}

2
app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt
View File

@ -4,6 +4,8 @@ import android.content.Intent
import com.simplemobiletools.commons.activities.BaseSplashActivity
class SplashActivity : BaseSplashActivity() {
override fun getAppPackageName() = packageName
override fun initActivity() {
startActivity(Intent(this, MainActivity::class.java))
finish()

4
app/src/main/kotlin/com/simplemobiletools/camera/helpers/PhotoProcessor.kt
View File

@ -46,7 +46,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr
val photoFile = File(path)
if (activity.needsStupidWritePermissions(path)) {
if (!activity.hasProperStoredTreeUri()) {
if (!activity.hasProperStoredTreeUri(activity.isPathOnOTG(path))) {
activity.toast(R.string.save_error_internal_storage)
activity.config.savePhotosFolder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString()
return ""
@ -107,7 +107,7 @@ class PhotoProcessor(val activity: MainActivity, val saveUri: Uri?, val deviceOr
try {
image.compress(Bitmap.CompressFormat.JPEG, activity.config.photoQuality, fos)
if (!isThirdPartyIntent) {
if (!isThirdPartyIntent && isNougatPlus()) {
activity.saveImageRotation(path, totalRotation)
}
} catch (e: Exception) {