karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug that would clear the database upon background refresh

Browse Source
This commit is contained in:
Deniz Düzgören
2019-08-07 07:25:06 +02:00
parent 52db4b20bb
commit 78e836b737
5 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
+13 -14
View File
@@ -15,7 +15,6 @@ import androidx.core.content.ContextCompat
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.google.android.material.snackbar.Snackbar
import org.jsoup.Jsoup
import org.jsoup.select.Elements
import java.lang.IndexOutOfBoundsException
import kotlin.collections.ArrayList
@@ -46,14 +45,13 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
private val foodUrl = "https://djd4rkn355.github.io/food.html"
override fun doInBackground(vararg params: Void?): Void? {
try {
// try {
if (menu) {
val foodViewModel = FoodViewModel(mApplication)
val docFood = Jsoup.connect(foodUrl).get()
val foodElements = docFood.select("th")
currentFoodTime = docFood.select("h1")[0].text()
if (currentFoodTime != prefs.getString("timeFood", "")) {
val foodViewModel = FoodViewModel(mApplication)
val foodElements = docFood.select("th")
var foodInt = 0
var priority = 0
foodViewModel.deleteAll()
@@ -101,10 +99,10 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
}
if (plan) {
val substViewModel = SubstViewModel(mApplication)
val doc = Jsoup.connect(substUrl).get()
currentTime = doc.select("h1")[0].text()
if (currentTime != prefs.getString("time", "")) {
val substViewModel = SubstViewModel(mApplication)
val rows = doc.select("tr")
val paragraphs = doc.select("p")
@@ -128,7 +126,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
for (i in 0 until rows.size) {
val row = rows[i]
val cols = row.select("th") as Elements
val cols = row.select("th")
groupS.add(cols[0].text())
dateS.add(cols[1].text())
@@ -174,8 +172,8 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
}
}
}
edit.putString("time", currentTime).apply()
}
if (jobservice && prefs.getBoolean("notif", true)) {
val openApp = Intent(mContext, Main::class.java)
openApp.flags = Intent.FLAG_ACTIVITY_NEW_TASK
@@ -209,6 +207,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
manager.notify(1, notification)
}
}
edit.putString("time", currentTime).apply()
}
}
@@ -222,12 +221,12 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
Snackbar.make(snackBarView, snackText, Snackbar.LENGTH_LONG).show()
}
}
} catch (e: Exception) {
mView?.let { v: View ->
val snackBarView = v.findViewById<View>(R.id.coordination)
Snackbar.make(snackBarView, mContext.getString(R.string.noInternet), Snackbar.LENGTH_LONG).setBackgroundTint(ContextCompat.getColor(mContext, R.color.colorError)).show()
}
}
// } catch (e: Exception) {
// mView?.let { v: View ->
// val snackBarView = v.findViewById<View>(R.id.coordination)
// Snackbar.make(snackBarView, mContext.getString(R.string.noInternet), Snackbar.LENGTH_LONG).setBackgroundTint(ContextCompat.getColor(mContext, R.color.colorError)).show()
// }
// }
return null
}
app/src/main/java/com/denizd/substitutionplan/Main.kt
+4 -4
View File
@@ -48,10 +48,6 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
edit.putInt("launchDev", prefs.getInt("launchDev", 0) + 1)
edit.apply()
if (prefs.getBoolean("notif", true)) {
notificationJob()
}
val appbarlayout = findViewById<AppBarLayout>(R.id.appbarlayout)
val toolbarTxt = findViewById<TextView>(R.id.toolbarTxt)
val bottomNav = findViewById<BottomNavigationView>(R.id.bottom_nav)
@@ -209,6 +205,10 @@ class Main : AppCompatActivity(R.layout.app_bar_main) {
}
}
}
if (prefs.getBoolean("notif", true)) {
notificationJob()
}
}
}
app/src/main/java/com/denizd/substitutionplan/NotificationService.kt
+7 -10
View File
@@ -30,18 +30,15 @@ class NotificationService : JobService() {
val networkStatus = connectivityManager.activeNetworkInfo
Thread(Runnable {
if (!prefs.getBoolean("notif", false)) {
if (!prefs.getBoolean("notif", false) || jobCancelled || networkStatus == null) {
jobFinished(params, false)
return@Runnable
} else {
if (jobCancelled || networkStatus == null) {
return@Runnable
}
if (prefs.getBoolean("notif", false)) {
edit.putInt("notificationTestNumberDev", prefs.getInt("notificationTestNumberDev", 0) + 1).apply()
try {
DataFetcher(true, true, true, context, application, null).execute()
} catch (ignored: Exception) {}
}
edit.putInt("notificationTestNumberDev", prefs.getInt("notificationTestNumberDev", 0) + 1).apply()
try {
DataFetcher(true, true, true, context, application, null).execute()
} catch (ignored: Exception) {}
jobFinished(params, false)
}
}).start()
app/src/main/java/com/denizd/substitutionplan/SubstRepository.kt
+1 -1
View File
@@ -33,7 +33,7 @@ public class SubstRepository(application: Application) {
}
class InsertSubstAsync(substDao: SubstDao?) : AsyncTask<Subst, Void, Void>() {
val mSubstDao = substDao
private val mSubstDao = substDao
override fun doInBackground(vararg substs: Subst): Void? {
mSubstDao?.insertSubst(substs[0])
return null