no auto updates on fdroid taking in account the subfix

fix tmo
raulhaag · Sep 1, 2018 · 0062f0e · 0062f0e
1 parent f516fca
commit 0062f0e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -48,7 +48,7 @@ android {
         }
         github {
             signingConfig signingConfigs.release
-            versionNameSuffix '-github'
+             //removed to maintain updates as now are
             dimension "builds"
         }
     }

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/MainFragment.java b/app/src/main/java/ar/rulosoft/mimanganu/MainFragment.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -143,7 +144,7 @@ public void onResume() {
             }
 
             // App Update
-            if (pm.getBoolean("app_update", true)) {
+            if (pm.getBoolean("app_update", true)  && !BuildConfig.VERSION_NAME.contains("fdroid")) {
                 boolean onLatestAppVersion = pm.getBoolean("on_latest_app_version", false);
                 if (onLatestAppVersion) {
                     long last_check = pm.getLong("last_app_update", 0);

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/PreferencesFragment.java b/app/src/main/java/ar/rulosoft/mimanganu/PreferencesFragment.java
@@ -284,6 +284,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         final Preference prefAbout = getPreferenceManager().findPreference("about_text");
         prefAbout.setSummary("v" + BuildConfig.VERSION_NAME);
 
+        /* Hide app update pref o f-droid users */
+        if(BuildConfig.VERSION_NAME.contains("fdroid")){
+            getPreferenceManager().findPreference("app_update").setVisible(false);
+        }
+
         /* This will check how much storage is taken by the mangas */
         new calcStorage().execute(current_filepath);
 

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/servers/TuMangaOnline.java b/app/src/main/java/ar/rulosoft/mimanganu/servers/TuMangaOnline.java
@@ -138,8 +138,8 @@ public void chapterInit(Chapter chapter) throws Exception {
         if (chapter.getPages() == 0) {
             String web = getNavWithNeededHeaders().getRedirectWeb("https://tumangaonline.me/goto/" + chapter.getPath());
             String data = getNavWithNeededHeaders().get(web.replaceAll("/[^/]+$", "/cascade"));
-            String basedir = getFirstMatch("dirPath\\s*=\\s*\"([^\"]+)\";", data, context.getString(R.string.error));
-            ArrayList<String> imgs = getAllMatch(".src\\s*=\\s*\\S*\\s*\\+\\s*'([^']+)'\\s*;", data);
+            String basedir = getFirstMatch("(https://[^']+/uploads/[^']+)", data, context.getString(R.string.error));
+            ArrayList<String> imgs = getAllMatch("getImage\\('([^']+)", data);
             chapter.setPages(imgs.size());
             chapter.setExtra( web + "|" + basedir + TextUtils.join("|" + basedir, imgs));
         }

diff --git a/app/src/main/java/ar/rulosoft/mimanganu/utils/UpdateUtil.java b/app/src/main/java/ar/rulosoft/mimanganu/utils/UpdateUtil.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import ar.rulosoft.mimanganu.BuildConfig;
 import ar.rulosoft.mimanganu.MessageActivity;
 import ar.rulosoft.mimanganu.R;
 import ar.rulosoft.navegadores.Navigator;
@@ -254,8 +255,7 @@ protected void onPreExecute() {
         protected Void doInBackground(Void... params) {
             try {
                 Triple<String,String, String> info = getCurrentVersion();
-                String currentVersionTmp = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
-                if (!currentVersionTmp.equals(info.getFirst())) {
+                if (!BuildConfig.VERSION_NAME.equals(info.getFirst())) {
                     Intent intent = new Intent(context, MessageActivity.class);
                     intent.putExtra(MessageActivity.MESSAGE_VALUE, MessageActivity.MESSAGE_UPDATE);
                     Util.getInstance().createNotification(context, false, (int) System.currentTimeMillis(), intent, context.getString(R.string.app_update), context.getString(R.string.app_name) + " v" + info.getFirst() + context.getString(R.string.is_available));