feat: Resume from my tickets after login (#563)

fossasia · Sep 20, 2018 · 581489e · 581489e
1 parent a1eadfa
commit 581489e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt b/app/src/main/java/org/fossasia/openevent/general/MainActivity.kt
@@ -12,6 +12,7 @@ import org.fossasia.openevent.general.auth.LAUNCH_ATTENDEE
 import org.fossasia.openevent.general.auth.ProfileFragment
 import org.fossasia.openevent.general.event.EventsFragment
 import org.fossasia.openevent.general.favorite.FavoriteFragment
+import org.fossasia.openevent.general.order.LAUNCH_TICKETS
 import org.fossasia.openevent.general.order.OrdersUnderUserFragment
 import org.fossasia.openevent.general.order.TICKETS
 import org.fossasia.openevent.general.search.SearchFragment
@@ -82,7 +83,7 @@ class MainActivity : AppCompatActivity() {
             openEventsFragment = false
         }
 
-        if (bundle != null && bundle.getBoolean(TICKETS)) {
+        if (bundle != null && (bundle.getBoolean(TICKETS) || bundle.getBoolean(LAUNCH_TICKETS))) {
             loadFragment(OrdersUnderUserFragment())
             supportActionBar?.title = "Tickets"
             navigation.selectedItemId = R.id.navigation_tickets

diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/LoginFragment.kt
@@ -14,6 +14,7 @@ import kotlinx.android.synthetic.main.fragment_login.*
 import kotlinx.android.synthetic.main.fragment_login.view.*
 import org.fossasia.openevent.general.MainActivity
 import org.fossasia.openevent.general.R
+import org.fossasia.openevent.general.order.LAUNCH_TICKETS
 import org.fossasia.openevent.general.ticket.EVENT_ID
 import org.fossasia.openevent.general.ticket.TICKET_ID_AND_QTY
 import org.fossasia.openevent.general.utils.Utils
@@ -31,7 +32,7 @@ class LoginFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val bundle = this.arguments
-        if (bundle != null) {
+        if (bundle != null && !bundle.getBoolean(LAUNCH_TICKETS)) {
             id = bundle.getLong(EVENT_ID, -1)
             ticketIdAndQty = bundle.getSerializable(TICKET_ID_AND_QTY) as List<Pair<Int, Int>>
         }
@@ -108,8 +109,10 @@ class LoginFragment : Fragment() {
 
     private fun redirectToMain(bundle: Bundle?) {
         val intent = Intent(activity, MainActivity::class.java)
-        if (((bundle != null) && !id.equals(-1)) && (ticketIdAndQty != null)) {
-            intent.putExtra(LAUNCH_ATTENDEE, true)
+        if (bundle != null) {
+            if (!id.equals(-1) && ticketIdAndQty != null) {
+                intent.putExtra(LAUNCH_ATTENDEE, true)
+            }
             intent.putExtras(bundle)
         }
         startActivity(intent)

diff --git a/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt b/app/src/main/java/org/fossasia/openevent/general/order/OrdersUnderUserFragment.kt
@@ -19,6 +19,7 @@ import org.koin.android.architecture.ext.viewModel
 import timber.log.Timber
 
 const val ORDERS: String = "orders"
+const val LAUNCH_TICKETS: String = "LAUNCH_TICKETS"
 
 class OrdersUnderUserFragment : Fragment() {
 
@@ -87,6 +88,9 @@ class OrdersUnderUserFragment : Fragment() {
     }
 
     private fun redirectToLogin() {
-        startActivity(Intent(activity, AuthActivity::class.java))
+        val authIntent = Intent(activity, AuthActivity::class.java)
+        val redirectFromTickets = true
+        authIntent.putExtra(LAUNCH_TICKETS, redirectFromTickets)
+        startActivity(authIntent)
     }
 }