Merge pull request #50 from banditAmit/vedant

Vedant
payatu · Dec 1, 2023 · 33728e4 · 33728e4
2 parents a827292 + c0b32c8
commit 33728e4
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 104 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,13 +7,29 @@ plugins {
 
 android {
     namespace 'com.BugBazaar'
-    compileSdk 32
+    compileSdk 33
 
     sourceSets {
         main {
             jniLibs.srcDirs = ['src/main/jniLibs']
         }
     }
+    signingConfigs {
+        release {
+            storeFile file('loki.jks')
+            storePassword 'Loki$$8090'
+            keyAlias 'loki'
+            keyPassword 'Loki$$8090'
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+            // Other release-specific configurations
+            //debuggable false
+        }
+    }
 
     defaultConfig {
         applicationId "com.BugBazaar"
@@ -61,9 +77,9 @@ dependencies {
     releaseImplementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    //testImplementation 'junit:junit:4.13.2'
+    //androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    //androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     //Custom installed modules
     implementation 'de.hdodenhof:circleimageview:3.1.0'

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.BugBazaar",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/androidTest/java/com/BugBazaar/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/BugBazaar/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,10 +37,10 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:testOnly="true"
+        android:testOnly="false"
         android:theme="@style/Theme.BugBazaar"
         android:usesCleartextTraffic="true"
-        tools:ignore="CustomPermissionTypo"
+        tools:ignore="CustomPermissionTypo,HardcodedDebugMode"
         tools:replace="android:fullBackupContent"
         tools:targetApi="31">
         <activity
@@ -70,27 +70,24 @@
             android:exported="false" />
         <activity
             android:name=".ui.addresses.Address"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.Wallet"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.myorders.OrderHistoryActivity"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.payment.OrderSummary"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.ContactsPack.SelectContacts"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.ContactsPack.ReferUs"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.cart.CartActivity"
-            android:exported="true" />
-        <activity
-            android:name=".ui.cart.Cart"
             android:exported="false" />
         <activity
             android:name=".ui.SplashActivity"
@@ -119,22 +116,22 @@
             android:exported="false" />
         <activity
             android:name=".ui.CreatePasscode"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.NavigationDrawer_Dashboard"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.MyProfile"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.TermsAndConditionsActivity"
             android:exported="true" />
         <activity
             android:name=".ui.Contact_us"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.PasscodeActivity"
-            android:exported="true" />
+            android:exported="false" />
         <activity
             android:name=".ui.Signin"
             android:clearTaskOnLaunch="true"
@@ -169,12 +166,12 @@
 
         <service
             android:name="com.darvin.security.IsolatedService"
-            android:enabled="true"
+            android:enabled="false"
             android:isolatedProcess="true"
             android:process=":tmpService" />
         <service
             android:name=".MyFirebaseInstanceIDService"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>

diff --git a/app/src/main/java/com/BugBazaar/ui/NavigationDrawer_Dashboard.java b/app/src/main/java/com/BugBazaar/ui/NavigationDrawer_Dashboard.java
@@ -163,7 +163,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onClick(View v) {
                 String searchText = String.valueOf(searchEditText.getText());
 
-                if (searchText.length() <= 30) {
+                if (searchText.length() <= 15) {
 
                     ArrayList<Product> filteredList = new ArrayList<>();
                     for (Product product : productList) {
@@ -185,11 +185,12 @@ public void onClick(View v) {
                     // Hide the keyboard
                     InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
                     imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
-                }
+                }else{
                 //DO NOT REMOVEIf you search for empty searchbox and app crashed, it is intentional. It is a "Improper Exception Handling" bug
                 String filteredList = null;
                 Log.d("Exception",filteredList);
             }
+            }
         });
 
         //Drawer and Navigation bar layout view find

diff --git a/app/src/main/java/com/BugBazaar/ui/SplashActivity.java b/app/src/main/java/com/BugBazaar/ui/SplashActivity.java
@@ -29,7 +29,8 @@
 
 public class SplashActivity extends AppCompatActivity  implements DetectMagisk.DetectionListener {
 
-    private static final int SPLASH_TIMEOUT = 2000; // 2 seconds
+    private static final int SPLASH_TIMEOUT = 500; //half second
+
     AlertDialogManager alertDialogManager = new AlertDialogManager();
 
 

diff --git a/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java b/app/src/main/java/com/BugBazaar/ui/TermsAndConditionsActivity.java
@@ -40,70 +40,50 @@ protected void onCreate(Bundle savedInstanceState) {
                 this.webViewUrl = getIntent().getExtras().getString(AppConstants.KEY_WEBVIEW_URL);
                 startWebView(this.webViewUrl);
             }
-
-
             }
 
         else {
             startdefaultwebview(AppConstants.Terms_Conditions_URL);
-
-
         }
 
-
-
 }
 
     private void startdefaultwebview(String terms_conditions_url) {
 
-        webView.loadUrl(webViewUrl);
-
-
+        webView.loadUrl(terms_conditions_url);
     }
 
     private void setupwebview(WebView webView) {
         webView.setWebViewClient(new WebViewClient());
         webView.setWebChromeClient(new WebChromeClient());
         webView.getSettings().setJavaScriptEnabled(true);
         webView.getSettings().setAllowUniversalAccessFromFileURLs(true);
-
-
     }
 
     private void startWebView(String webViewUrl) {
 
         if (webViewUrl.startsWith("bugbazaar.com")) {
             webView.addJavascriptInterface(new JavaScriptInterface(), "Androidinterface");
             webView.loadUrl(webViewUrl);
-
-
         }
 
         else if (webViewUrl.endsWith(".bugbazaar.com")){
             CookieManager cookieManager = CookieManager.getInstance();
             cookieManager.setCookie(webViewUrl, getsessionid());
 
-            Log.d("hello","cookieset");
-
-
+           // Log.d("hello","cookieset");
         }
 
         webView.loadUrl(webViewUrl);
 
 
-
-
     }
 
     private String getsessionid() {
-
         return String.valueOf(UUID.randomUUID());
     }
 
-    //Code to handle backbutton
-    public void onBackButtonClick(View view) {
-        onBackPressed(); // Navigate back to the previous activity
-    }
+
 
     private class JavaScriptInterface {
         @android.webkit.JavascriptInterface
@@ -119,7 +99,6 @@ public String showToast(String message) {
 
         @android.webkit.JavascriptInterface
         public String gettoken(){
-
             return String.valueOf(UUID.randomUUID());
         }
 
@@ -136,4 +115,8 @@ public String getpassword(){
         }
 
     }
+    //Code to handle backbutton
+    public void onBackButtonClick(View view) {
+        onBackPressed(); // Navigate back to the previous activity
+    }
 }
diff --git a/app/src/main/java/com/BugBazaar/ui/addresses/Address.java b/app/src/main/java/com/BugBazaar/ui/addresses/Address.java
@@ -38,14 +38,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_address);
         addressListLayout = findViewById(R.id.addressListLayout);
-        //Session check
-        sessionManager = new SessionManager(this);
-        if (sessionManager.getUserToken()==null) {
-            Toast.makeText(getApplicationContext(),"Please login first",Toast.LENGTH_SHORT).show();
-            // The user is not logged in; redirect to the login activity
-            startActivity(new Intent(this, Signin.class));
-            finish();  // Prevent going back to the previous activity
-        }
 
         //Toolbar title set
         TextView toolbarTitle = findViewById(R.id.toolbarTitle);

diff --git a/app/src/main/java/com/BugBazaar/utils/AppConstants.java b/app/src/main/java/com/BugBazaar/utils/AppConstants.java
@@ -10,7 +10,7 @@
 public class AppConstants {
 
     public static final String KEY_WEBVIEW_URL = "webViewUrl";
-    public  static  final String Terms_Conditions_URL ="https://payatu.io";
+    public  static  final String Terms_Conditions_URL ="https://payatu.com";
 
 Context context;
 

diff --git a/app/src/main/java/com/BugBazaar/utils/checkWorker.java b/app/src/main/java/com/BugBazaar/utils/checkWorker.java
@@ -83,7 +83,6 @@ private double executeDynamicallyLoadedCode(String fileName) {
             double totalPrice = 100.0; // Replace with your actual price
             discountedPrice = (double) discountModuleClass.getMethod("applyDiscount", double.class).invoke(discountModule, totalPrice);
 
-            Toast.makeText(context, "discountedPrice price" + discountedPrice, Toast.LENGTH_SHORT).show();
         } catch (Exception e) {
             e.printStackTrace();
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5,6 +5,6 @@
     <string name="my_profile">My Profile</string>
     <!-- Items Description -->
     <string name="desc_cycle">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</string>
-
+    <string name="hardc0d3d_passw0rd">BugBazaarSeccool</string>
 
 </resources>
diff --git a/app/src/test/java/com/BugBazaar/ExampleUnitTest.java b/app/src/test/java/com/BugBazaar/ExampleUnitTest.java
diff --git a/gradle.properties b/gradle.properties
@@ -15,3 +15,4 @@ android.enableJetifier=true
 android.nonTransitiveRClass=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding\=UTF-8
+android.injected.testOnly=false