Skip to content

Commit 8590404

Browse files
committed
Intent controlled without any account configured previously
1 parent d104405 commit 8590404

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

owncloudApp/src/main/java/com/owncloud/android/extensions/ActivityExt.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ fun Activity.showMessageInSnackbar(
7070
Snackbar.make(findViewById(layoutId), message, duration).show()
7171
}
7272

73+
fun Activity.showMessageInToast(
74+
message: CharSequence,
75+
duration: Int = Toast.LENGTH_LONG
76+
) {
77+
Toast.makeText(this, message, duration).show()
78+
}
79+
80+
7381
fun Activity.showErrorInToast(
7482
genericErrorMessageId: Int,
7583
throwable: Throwable?,

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ import com.owncloud.android.AppRater
5151
import com.owncloud.android.BuildConfig
5252
import com.owncloud.android.MainApp
5353
import com.owncloud.android.R
54+
import com.owncloud.android.authentication.AccountUtils
5455
import com.owncloud.android.databinding.ActivityMainBinding
5556
import com.owncloud.android.datamodel.FileDataStorageManager
5657
import com.owncloud.android.datamodel.OCFile
5758
import com.owncloud.android.extensions.checkPasscodeEnforced
5859
import com.owncloud.android.extensions.manageOptionLockSelected
5960
import com.owncloud.android.extensions.showMessageInSnackbar
61+
import com.owncloud.android.extensions.showMessageInToast
6062
import com.owncloud.android.files.services.FileDownloader
6163
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder
6264
import com.owncloud.android.files.services.FileUploader
@@ -153,6 +155,9 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
153155

154156
localBroadcastManager = LocalBroadcastManager.getInstance(this)
155157

158+
val dataIntent: Uri? = intent.data
159+
manageDataIntent(dataIntent)
160+
156161
/// Load of saved instance state
157162
if (savedInstanceState != null) {
158163
Timber.d(savedInstanceState.toString())
@@ -1647,6 +1652,12 @@ class FileDisplayActivity : FileActivity(), FileFragment.ContainerActivity, OnEn
16471652
manageOptionLockSelected(type)
16481653
}
16491654

1655+
private fun manageDataIntent(uri: Uri?) {
1656+
if (uri != null && AccountUtils.getAccounts(applicationContext).isEmpty()) {
1657+
showMessageInToast(getString(R.string.no_account_configured))
1658+
}
1659+
}
1660+
16501661
companion object {
16511662
private const val TAG_LIST_OF_FILES = "LIST_OF_FILES"
16521663
private const val TAG_SECOND_FRAGMENT = "SECOND_FRAGMENT"

owncloudApp/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,4 +647,7 @@
647647
<string name="security_enforced_first_option">Passcode lock</string>
648648
<string name="security_enforced_second_option">Pattern lock</string>
649649

650+
<!--Deep Links-->
651+
<string name="no_account_configured">No account configured previously</string>
652+
650653
</resources>

0 commit comments

Comments
 (0)