From 361631b6ac52d823919696f25083b7e46b027531 Mon Sep 17 00:00:00 2001 From: Matte23 Date: Fri, 30 Oct 2020 11:09:31 +0100 Subject: [PATCH] Format code, add google-services.json as Github secret --- .github/workflows/ci.yml | 20 +++++++++++++++++++ .../underdesk/circolapp/SettingsActivity.kt | 12 +++++------ .../underdesk/circolapp/server/ServerAPI.kt | 16 +++++++-------- .../net/underdesk/circolapp/works/PollWork.kt | 9 ++++----- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35d4264..0dc4c38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,11 @@ jobs: uses: actions/setup-java@v1.4.2 with: java-version: 1.8 + - name: Inflate google-services.json + shell: bash + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES }} + run: echo $GOOGLE_SERVICES_JSON > app/google-services.json - name: Unit tests run: bash ./gradlew test @@ -30,6 +35,11 @@ jobs: uses: actions/setup-java@v1.4.2 with: java-version: 1.8 + - name: Inflate google-services.json + shell: bash + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES }} + run: echo $GOOGLE_SERVICES_JSON > app/google-services.json - name: Run Android Lint run: bash ./gradlew lint @@ -43,6 +53,11 @@ jobs: uses: actions/setup-java@v1.4.2 with: java-version: 1.8 + - name: Inflate google-services.json + shell: bash + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES }} + run: echo $GOOGLE_SERVICES_JSON > app/google-services.json - name: Run Kotlin Lint run: bash ./gradlew ktlintCheck @@ -56,6 +71,11 @@ jobs: uses: actions/setup-java@v1.4.2 with: java-version: 1.8 + - name: Inflate google-services.json + shell: bash + env: + GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES }} + run: echo $GOOGLE_SERVICES_JSON > app/google-services.json - name: Build debug APK run: bash ./gradlew assembleDebug - name: Upload APK diff --git a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt index 9c0d239..3de6963 100644 --- a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt +++ b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt @@ -42,7 +42,8 @@ class SettingsActivity : AppCompatActivity() { supportActionBar?.setDisplayHomeAsUpEnabled(true) } - class SettingsFragment : PreferenceFragmentCompat(), + class SettingsFragment : + PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.root_preferences, rootKey) @@ -104,11 +105,10 @@ class SettingsActivity : AppCompatActivity() { activity?.let { PollWork.enqueue(it) } - if (sharedPreferences.getBoolean( - "notify_new_circulars", - true - ) && !sharedPreferences.getBoolean("enable_polling", false) - ) { + val notifyNewCirculars = sharedPreferences.getBoolean("notify_new_circulars", true) + val enablePolling = sharedPreferences.getBoolean("enable_polling", false) + + if (notifyNewCirculars && !enablePolling) { val serverID = ServerAPI.getInstance(requireContext()).serverID() val serverToken = ServerAPI.Companion.Servers.values()[serverID].toString() diff --git a/app/src/main/java/net/underdesk/circolapp/server/ServerAPI.kt b/app/src/main/java/net/underdesk/circolapp/server/ServerAPI.kt index 503ae9f..cdce8a2 100644 --- a/app/src/main/java/net/underdesk/circolapp/server/ServerAPI.kt +++ b/app/src/main/java/net/underdesk/circolapp/server/ServerAPI.kt @@ -74,11 +74,10 @@ class ServerAPI( } fun getInstance(context: Context): ServerAPI { - val preferenceManager = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val serverID = sharedPreferences.getString("school", "0")?.toInt() ?: 0 - val server = Servers.values()[ - preferenceManager.getString("school", "0")?.toInt() ?: 0 - ] + val server = Servers.values()[serverID] return instance ?: synchronized(this) { instance ?: ServerAPI(createServer(server)).also { instance = it } @@ -89,11 +88,10 @@ class ServerAPI( val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) val newServer = Servers.values()[index] - if (sharedPreferences.getBoolean( - "notify_new_circulars", - true - ) && !sharedPreferences.getBoolean("enable_polling", false) - ) + val notifyNewCirculars = sharedPreferences.getBoolean("notify_new_circulars", true) + val enablePolling = sharedPreferences.getBoolean("enable_polling", false) + + if (notifyNewCirculars && !enablePolling) FirebaseTopicUtils.selectTopic(newServer.toString(), context) instance?.changeServer(createServer(newServer)) diff --git a/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt b/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt index 8e61ef6..0ba3534 100644 --- a/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt +++ b/app/src/main/java/net/underdesk/circolapp/works/PollWork.kt @@ -65,11 +65,10 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) : fun enqueue(context: Context) { val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) - if (sharedPreferences.getBoolean( - "notify_new_circulars", - true - ) && sharedPreferences.getBoolean("enable_polling", false) - ) { + val notifyNewCirculars = sharedPreferences.getBoolean("notify_new_circulars", true) + val enablePolling = sharedPreferences.getBoolean("enable_polling", false) + + if (notifyNewCirculars && enablePolling) { WorkManager.getInstance(context) .enqueueUniquePeriodicWork( pollWorkName,