Fix bug

app/build.gradle

@@ -26,7 +26,7 @@ android {
         minSdk 26
         targetSdk 32
         versionCode 1
-        versionName "0.1.0"
+        versionName "0.1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "0.1.0",
+      "versionName": "0.1.1",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/com/capstone/foodify/Activity/ForgotPasswordActivity.java

@@ -60,6 +60,7 @@ public class ForgotPasswordActivity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 onBackPressed();
+                finish();
             }
         });
 

app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java

@@ -19,6 +19,8 @@ public class OrderActivity extends AppCompatActivity {
     ViewPagerAdapter viewPagerAdapter;
     ImageView back_image;
 
+    public static Activity orderActivity;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,6 +34,8 @@ public class OrderActivity extends AppCompatActivity {
         viewPagerAdapter = new ViewPagerAdapter(this);
         viewPager2.setAdapter(viewPagerAdapter);
 
+        orderActivity = this;
+
         tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {

app/src/main/java/com/capstone/foodify/Activity/OrderDetailActivity.java

@@ -164,6 +164,8 @@ public class OrderDetailActivity extends AppCompatActivity {
                                 @Override
                                 public void onClick(@NonNull AestheticDialog.Builder builder) {
 
+                                    OrderActivity.orderActivity.finish();
+
                                     startActivity(new Intent(OrderDetailActivity.this, OrderActivity.class));
                                     builder.dismiss();
                                     finish();

app/src/main/java/com/capstone/foodify/Common.java

@@ -40,7 +40,8 @@ import retrofit2.Callback;
 import retrofit2.Response;
 
 public class Common {
-    public static final String BASE_URL = "http://192.168.1.183:8080/api/";
+    //https://foodify-backend-production.up.railway.app/
+    public static final String BASE_URL = "https://foodify-backend-production.up.railway.app/api/";
     public static String FCM_TOKEN = null;
     public static Location CURRENT_LOCATION = null;
     public static final String MAP_API = "AIzaSyAY14Ic32UP26Hg6GILznOfbBihiY5BUxw";