Update to v6.17

jn7163 · Oct 24, 2020 · a65836c · a65836c
1 parent f93e94a
commit a65836c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/AnLinux/.idea/caches/build_file_checksums.ser b/AnLinux/.idea/caches/build_file_checksums.ser
diff --git a/AnLinux/app/build.gradle b/AnLinux/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "exa.lnx.a"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 616
-        versionName "6.16 Stable"
+        versionCode 617
+        versionName "6.17 Stable"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -22,9 +22,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'com.google.android.gms:play-services-ads:19.4.0'
+    implementation 'com.google.android.gms:play-services-ads:19.5.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

diff --git a/AnLinux/app/release/app-release.apk b/AnLinux/app/release/app-release.apk
diff --git a/AnLinux/app/release/output-metadata.json b/AnLinux/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 616,
-      "versionName": "6.16 Stable",
+      "versionCode": 617,
+      "versionName": "6.17 Stable",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

diff --git a/AnLinux/app/src/main/java/exa/lnx/a/MainUI.java b/AnLinux/app/src/main/java/exa/lnx/a/MainUI.java
@@ -77,9 +77,14 @@ protected void onCreate(Bundle savedInstanceState) {
         mInterstitialAd = new InterstitialAd(context);
         mInterstitialAd.setAdUnitId("ca-app-pub-5748356089815497/3581271493");
 
+        mAdView = findViewById(R.id.adView);
+
         if(!donationInstalled() && !isVideoAdsWatched()){
             mInterstitialAd.loadAd(new AdRequest.Builder().build());
             shouldShowAds = true;
+            mAdView.loadAd(new AdRequest.Builder().build());
+        }else if(donationInstalled()){
+            mAdView.setVisibility(View.GONE);
         }
 
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -95,12 +100,6 @@ protected void onCreate(Bundle savedInstanceState) {
         relativeLayout = findViewById(R.id.fragmentHolder);
         isOreoNotified = sharedPreferences.getBoolean("IsOreoNotified", false);
 
-        mAdView = findViewById(R.id.adView);
-
-        if(!donationInstalled() && !isVideoAdsWatched()){
-            mAdView.loadAd(new AdRequest.Builder().build());
-        }
-
         navigationView = findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
 
@@ -720,7 +719,12 @@ public void onClick(DialogInterface dialog, int which) {
     }
     private boolean donationInstalled() {
         PackageManager packageManager = context.getPackageManager();
-        return packageManager.checkSignatures(context.getPackageName(), "exa.lnx.d") == PackageManager.SIGNATURE_MATCH;
+        try {
+            packageManager.getPackageInfo("exa.lnx.d", 0);
+            return true;
+        }catch(PackageManager.NameNotFoundException e) {
+            return false;
+        }
     }
     private boolean isVideoAdsWatched(){
         Calendar cal = Calendar.getInstance();

diff --git a/AnLinux/app/src/main/res/layout/fragment_holder.xml b/AnLinux/app/src/main/res/layout/fragment_holder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fragmentHolder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"