Skip to content

Commit ba780f4

Browse files
authored
Merge pull request #111 from im-indrajeet/master
Turn flashlight on at startup bug resolved
2 parents db7d162 + d27ca9f commit ba780f4

File tree

1 file changed

+11
-0
lines changed
  • app/src/main/kotlin/com/simplemobiletools/flashlight/activities

1 file changed

+11
-0
lines changed

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class MainActivity : SimpleActivity() {
3636
private var mBus: EventBus? = null
3737
private var mCameraImpl: MyCameraImpl? = null
3838
private var mIsFlashlightOn = false
39+
private var reTurnFlashlightOn = true
3940

4041
override fun onCreate(savedInstanceState: Bundle?) {
4142
super.onCreate(savedInstanceState)
@@ -46,6 +47,7 @@ class MainActivity : SimpleActivity() {
4647
changeIconColor(getContrastColor(), stroboscope_btn)
4748

4849
bright_display_btn.setOnClickListener {
50+
reTurnFlashlightOn = false
4951
startActivity(Intent(applicationContext, BrightDisplayActivity::class.java))
5052
}
5153

@@ -89,6 +91,13 @@ class MainActivity : SimpleActivity() {
8991

9092
requestedOrientation = if (config.forcePortraitMode) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_SENSOR
9193
invalidateOptionsMenu()
94+
95+
if(config.turnFlashlightOn && reTurnFlashlightOn) {
96+
mCameraImpl!!.enableFlashlight()
97+
}
98+
99+
reTurnFlashlightOn = true
100+
92101
checkShortcuts()
93102
}
94103

@@ -146,10 +155,12 @@ class MainActivity : SimpleActivity() {
146155
}
147156

148157
private fun launchSettings() {
158+
reTurnFlashlightOn = false
149159
startActivity(Intent(applicationContext, SettingsActivity::class.java))
150160
}
151161

152162
private fun launchAbout() {
163+
reTurnFlashlightOn = false
153164
val licenses = LICENSE_EVENT_BUS
154165

155166
val faqItems = arrayListOf(

0 commit comments

Comments
 (0)