From 3cddd70a5bf467aa3d7009a06784865ce88021c7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 28 Feb 2018 22:49:39 +0100 Subject: [PATCH 01/11] update commons to 3.14.1 --- app/build.gradle | 2 +- .../contacts/activities/MainActivity.kt | 1 - .../contacts/extensions/TabLayout.kt | 17 ----------------- .../contacts/fragments/MyViewPagerFragment.kt | 3 +-- .../contacts/helpers/Config.kt | 4 ---- .../contacts/helpers/Constants.kt | 1 - app/src/main/res/layout/activity_main.xml | 4 +--- 7 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/extensions/TabLayout.kt diff --git a/app/build.gradle b/app/build.gradle index 21c2d2ea..2a55a51f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.12.20' + implementation 'com.simplemobiletools:commons:3.14.1' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.google.code.gson:gson:2.8.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index aa37373e..dbf92ed6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -25,7 +25,6 @@ import com.simplemobiletools.contacts.dialogs.FilterContactSourcesDialog import com.simplemobiletools.contacts.dialogs.ImportContactsDialog import com.simplemobiletools.contacts.extensions.config import com.simplemobiletools.contacts.extensions.getTempFile -import com.simplemobiletools.contacts.extensions.onTabSelectionChanged import com.simplemobiletools.contacts.helpers.ContactsHelper import com.simplemobiletools.contacts.helpers.VcfExporter import com.simplemobiletools.contacts.interfaces.RefreshContactsListener diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/TabLayout.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/TabLayout.kt deleted file mode 100644 index f31bef05..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/TabLayout.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.simplemobiletools.contacts.extensions - -import android.support.design.widget.TabLayout - -fun TabLayout.onTabSelectionChanged(tabUnselectedAction: (inactiveTab: TabLayout.Tab) -> Unit, tabSelectedAction: (activeTab: TabLayout.Tab) -> Unit) = - setOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { - override fun onTabSelected(tab: TabLayout.Tab) { - tabSelectedAction(tab) - } - - override fun onTabUnselected(tab: TabLayout.Tab) { - tabUnselectedAction(tab) - } - - override fun onTabReselected(tab: TabLayout.Tab) { - } - }) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt index a2517ff1..2b078409 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.contacts.fragments import android.content.Context -import android.graphics.Paint import android.support.design.widget.CoordinatorLayout import android.util.AttributeSet import android.view.ViewGroup @@ -40,7 +39,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) placeholderClicked() } - fragment_placeholder_2.paintFlags = fragment_placeholder_2.paintFlags or Paint.UNDERLINE_TEXT_FLAG + fragment_placeholder_2.underlineText() updateViewStuff() if (this is FavoritesFragment) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt index f6613b07..81c3bf65 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Config.kt @@ -30,10 +30,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getString(LAST_USED_CONTACT_SOURCE, "") set(lastUsedContactSource) = prefs.edit().putString(LAST_USED_CONTACT_SOURCE, lastUsedContactSource).apply() - var lastUsedViewPagerPage: Int - get() = prefs.getInt(LAST_USED_VIEW_PAGER_PAGE, 0) - set(lastUsedViewPagerPage) = prefs.edit().putInt(LAST_USED_VIEW_PAGER_PAGE, lastUsedViewPagerPage).apply() - var localAccountName: String get() = prefs.getString(LOCAL_ACCOUNT_NAME, "-1") set(localAccountName) = prefs.edit().putString(LOCAL_ACCOUNT_NAME, localAccountName).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt index b59e18ca..6f104a57 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt @@ -6,7 +6,6 @@ const val SHOW_PHONE_NUMBERS = "show_phone_numbers" const val DISPLAY_CONTACT_SOURCES = "display_contact_sources" const val START_NAME_WITH_SURNAME = "start_name_with_surname" const val LAST_USED_CONTACT_SOURCE = "last_used_contact_source" -const val LAST_USED_VIEW_PAGER_PAGE = "last_used_view_pager_page" const val LOCAL_ACCOUNT_NAME = "local_account_name" const val LOCAL_ACCOUNT_TYPE = "local_account_type" const val ON_CONTACT_CLICK = "on_contact_click" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 23457c44..f3250f88 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,11 +2,9 @@ + android:layout_height="match_parent"> Date: Thu, 1 Mar 2018 16:41:48 +0100 Subject: [PATCH 02/11] simplify AddFavoritesDialog confirmation --- .../contacts/dialogs/AddFavoritesDialog.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt index e0992e10..4e0c1a68 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt @@ -43,13 +43,10 @@ class AddFavoritesDialog(val activity: SimpleActivity, private val callback: () } dialog = AlertDialog.Builder(activity) - .setPositiveButton(R.string.ok, null) + .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() }) .setNegativeButton(R.string.cancel, null) .create().apply { activity.setupDialogStuff(view, this) - getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { - dialogConfirmed() - } } } @@ -66,7 +63,6 @@ class AddFavoritesDialog(val activity: SimpleActivity, private val callback: () contactsHelper.removeFavorites(allDisplayedContacts) callback() - dialog?.dismiss() }.start() } } From f37d7a0d104d903b4e4083f7d4db5ab82022a25a Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 2 Mar 2018 12:08:11 +0100 Subject: [PATCH 03/11] catch and display exceptions thrown at querying contact sources --- .../com/simplemobiletools/contacts/helpers/ContactsHelper.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index 1c9c62cb..e0d6b711 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -361,6 +361,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { sources.add(contactSource) } while (cursor.moveToNext()) } + } catch (e: Exception) { + activity.showErrorToast(e) } finally { cursor?.close() } From fd055152df1a19ccbaf7d09daa3c1cbe211e6d38 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 2 Mar 2018 12:09:52 +0100 Subject: [PATCH 04/11] updating commons and kotlin --- app/build.gradle | 2 +- .../simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt | 3 +-- build.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2a55a51f..9d28db7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.14.1' + implementation 'com.simplemobiletools:commons:3.14.4' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.google.code.gson:gson:2.8.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt index 4e0c1a68..9463beee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/dialogs/AddFavoritesDialog.kt @@ -12,7 +12,6 @@ import com.simplemobiletools.contacts.models.Contact import kotlinx.android.synthetic.main.layout_select_contact.view.* class AddFavoritesDialog(val activity: SimpleActivity, private val callback: () -> Unit) { - private var dialog: AlertDialog? = null private var view = activity.layoutInflater.inflate(R.layout.layout_select_contact, null) private val config = activity.config private var allContacts = ArrayList() @@ -42,7 +41,7 @@ class AddFavoritesDialog(val activity: SimpleActivity, private val callback: () } } - dialog = AlertDialog.Builder(activity) + AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() }) .setNegativeButton(R.string.cancel, null) .create().apply { diff --git a/build.gradle b/build.gradle index a3b736f3..73d77ca8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.2.30' repositories { google() From 9cb647ca12545a548846c0d608af928f871a8ab9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 2 Mar 2018 12:10:06 +0100 Subject: [PATCH 05/11] make sure we have the database created in time at launch --- .../com/simplemobiletools/contacts/activities/MainActivity.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index dbf92ed6..9b64b946 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -24,6 +24,7 @@ import com.simplemobiletools.contacts.dialogs.ExportContactsDialog import com.simplemobiletools.contacts.dialogs.FilterContactSourcesDialog import com.simplemobiletools.contacts.dialogs.ImportContactsDialog import com.simplemobiletools.contacts.extensions.config +import com.simplemobiletools.contacts.extensions.dbHelper import com.simplemobiletools.contacts.extensions.getTempFile import com.simplemobiletools.contacts.helpers.ContactsHelper import com.simplemobiletools.contacts.helpers.VcfExporter @@ -53,6 +54,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { appLaunched() setupTabColors() + // just get a reference to the database to make sure it is created properly + dbHelper + handlePermission(PERMISSION_READ_CONTACTS) { if (it) { handlePermission(PERMISSION_WRITE_CONTACTS) { From 38a8df9dc3a5ddc2a96eb2328a737cb61f30ed04 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 2 Mar 2018 12:13:14 +0100 Subject: [PATCH 06/11] update version to 3.3.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9d28db7a..dc2d2a04 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.contacts" minSdkVersion 16 targetSdkVersion 27 - versionCode 11 - versionName "3.3.0" + versionCode 12 + versionName "3.3.1" setProperty("archivesBaseName", "contacts") } From e85dd634e67788db5852b9c77bbfa4cdc49078f4 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 2 Mar 2018 12:13:25 +0100 Subject: [PATCH 07/11] updating changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 315a7e95..7adab431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 3.3.1 *(2018-03-02)* +---------------------------- + + * Couple stability and translation improvements + Version 3.3.0 *(2018-02-22)* ---------------------------- From 3105093272a77f45091b332fca6e01707354cc4a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 3 Mar 2018 12:59:16 +0100 Subject: [PATCH 08/11] adding a couple crashfixes --- .../contacts/activities/ContactActivity.kt | 10 +++++++--- .../contacts/activities/MainActivity.kt | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt index 1a63a6bf..0ef88394 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt @@ -95,13 +95,17 @@ abstract class ContactActivity : SimpleActivity() { fun deleteContact() { ConfirmationDialog(this) { - ContactsHelper(this).deleteContact(contact!!) - finish() + if (contact != null) { + ContactsHelper(this).deleteContact(contact!!) + finish() + } } } fun shareContact() { - shareContacts(arrayListOf(contact!!)) + if (contact != null) { + shareContacts(arrayListOf(contact!!)) + } } fun trySendSMS() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 9b64b946..023ee693 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -190,7 +190,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { override fun onQueryTextChange(newText: String): Boolean { if (isSearchOpen) { - getCurrentFragment().onSearchQueryChanged(newText) + getCurrentFragment()?.onSearchQueryChanged(newText) } return true } From 5f8c13ff9a63de0a2245a3cf2e71af23fa85246f Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 09:06:38 +0100 Subject: [PATCH 09/11] update commons to 3.14.12 --- app/build.gradle | 2 +- .../simplemobiletools/contacts/adapters/ContactsAdapter.kt | 6 +++--- .../contacts/adapters/FilterContactSourcesAdapter.kt | 2 +- .../contacts/adapters/SelectContactsAdapter.kt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dc2d2a04..24526456 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.14.4' + implementation 'com.simplemobiletools:commons:3.14.12' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.google.code.gson:gson:2.8.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt index 6250fbfe..0f8207a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt @@ -82,7 +82,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList Date: Sun, 4 Mar 2018 09:08:46 +0100 Subject: [PATCH 10/11] update version to 3.3.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 24526456..55010296 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.simplemobiletools.contacts" minSdkVersion 16 targetSdkVersion 27 - versionCode 12 - versionName "3.3.1" + versionCode 13 + versionName "3.3.2" setProperty("archivesBaseName", "contacts") } From 004cf57385788a3f16c04acf5b3e35e8f83660bc Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 4 Mar 2018 09:08:52 +0100 Subject: [PATCH 11/11] updating changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7adab431..60391fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========== +Version 3.3.2 *(2018-03-04)* +---------------------------- + + * Some stability and translation improvements + Version 3.3.1 *(2018-03-02)* ----------------------------