From a290eabc8292eb2f7d133163f49765b4ad61c310 Mon Sep 17 00:00:00 2001 From: Jon Zolla Date: Sun, 13 Jan 2019 22:33:59 -0800 Subject: [PATCH 1/2] Remove unused update code. --- .../com/totsp/crossword/net/Downloaders.java | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/app/src/main/java/com/totsp/crossword/net/Downloaders.java b/app/src/main/java/com/totsp/crossword/net/Downloaders.java index a9886839..bfda23fc 100755 --- a/app/src/main/java/com/totsp/crossword/net/Downloaders.java +++ b/app/src/main/java/com/totsp/crossword/net/Downloaders.java @@ -19,7 +19,6 @@ import com.totsp.crossword.shortyz.ShortyzApplication; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -284,58 +283,6 @@ private void download(Map puzzlesToDownload) { } - { // DO UPDATES - - ArrayList checkUpdate = new ArrayList(); - - try { - for (File file : crosswords.listFiles()) { - if (file.getName() - .endsWith(".shortyz")) { - File puz = new File(file.getAbsolutePath().substring(0, - file.getAbsolutePath().lastIndexOf('.') + 1) + "puz"); - System.out.println(puz.getAbsolutePath()); - - if (!newlyDownloaded.contains(puz)) { - checkUpdate.add(puz); - } - } - } - - archive.mkdirs(); - - for (File file : archive.listFiles()) { - if (file.getName() - .endsWith(".shortyz")) { - checkUpdate.add(new File(file.getAbsolutePath().substring(0, - file.getAbsolutePath().lastIndexOf('.') + 1) + "puz")); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - - for (File file : checkUpdate) { - try { - IO.meta(file); - - // if ((meta != null) && meta.updatable && (nyt != null) && - // nyt.getName().equals(meta.source)) { - // System.out.println("Trying update for " + file); - // - // File updated = nyt.update(file); - // - // if (updated != null) { - // this.postUpdatedNotification(i, nyt.getName(), - // updated); - // } - // } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - if (this.notificationManager != null) { this.notificationManager.cancel(0); } From 530caa9d0a3c8c71e13568002c7f039cff35eaf1 Mon Sep 17 00:00:00 2001 From: Jon Zolla Date: Sun, 13 Jan 2019 22:50:16 -0800 Subject: [PATCH 2/2] Remove code supporting Gingerbread and below. --- .../com/totsp/crossword/BrowseActivity.java | 3 +- .../totsp/crossword/net/DownloadReceiver.java | 16 ++- .../crossword/net/DownloadReceiverGinger.java | 11 +- .../crossword/shortyz/ShortyzApplication.java | 8 -- .../versions/AndroidVersionUtils.java | 4 +- .../crossword/versions/GingerbreadUtil.java | 106 ------------------ .../crossword/versions/HoneycombUtil.java | 41 ++++++- .../crossword/view/ScrollingImageView.java | 28 +++-- .../view/recycler/ScrollDetector.java | 16 +-- 9 files changed, 72 insertions(+), 161 deletions(-) delete mode 100755 app/src/main/java/com/totsp/crossword/versions/GingerbreadUtil.java diff --git a/app/src/main/java/com/totsp/crossword/BrowseActivity.java b/app/src/main/java/com/totsp/crossword/BrowseActivity.java index cb368db2..12e16616 100755 --- a/app/src/main/java/com/totsp/crossword/BrowseActivity.java +++ b/app/src/main/java/com/totsp/crossword/BrowseActivity.java @@ -844,8 +844,7 @@ public void onItemClick(AdapterView list, View view, int arg2, long arg3) { //Only spawn a thread if there are a lot of puzzles. // Using SDK rev as a proxy to decide whether you have a slow processor or not. - if (((android.os.Build.VERSION.SDK_INT >= 5) && directory.exists() && (directory.list().length > 500)) || - ((android.os.Build.VERSION.SDK_INT < 5) && directory.exists() && (directory.list().length > 160))) { + if (directory.exists() && (directory.list().length > 500)) { Runnable r = new Runnable() { public void run() { currentAdapter = BrowseActivity.this.buildList(dialog, directory, BrowseActivity.this.accessor); diff --git a/app/src/main/java/com/totsp/crossword/net/DownloadReceiver.java b/app/src/main/java/com/totsp/crossword/net/DownloadReceiver.java index 0896bc24..e18a237a 100755 --- a/app/src/main/java/com/totsp/crossword/net/DownloadReceiver.java +++ b/app/src/main/java/com/totsp/crossword/net/DownloadReceiver.java @@ -1,7 +1,5 @@ package com.totsp.crossword.net; -import java.util.HashMap; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -9,6 +7,8 @@ import com.totsp.crossword.puz.PuzzleMeta; +import java.util.HashMap; + public class DownloadReceiver extends BroadcastReceiver { public static HashMap metas = new HashMap(); @@ -16,13 +16,11 @@ public class DownloadReceiver extends BroadcastReceiver { private BroadcastReceiver impl; { - if(android.os.Build.VERSION.SDK_INT >= 9){ - try{ - BroadcastReceiver built = (BroadcastReceiver) Class.forName("com.totsp.crossword.net.DownloadReceiverGinger").newInstance(); - impl = built; - } catch(Exception e){ - e.printStackTrace(); - } + try{ + BroadcastReceiver built = (BroadcastReceiver) Class.forName("com.totsp.crossword.net.DownloadReceiverGinger").newInstance(); + impl = built; + } catch(Exception e){ + e.printStackTrace(); } if(impl == null){ impl = new DownloadReceiverNoop(); diff --git a/app/src/main/java/com/totsp/crossword/net/DownloadReceiverGinger.java b/app/src/main/java/com/totsp/crossword/net/DownloadReceiverGinger.java index 2ecb9a00..f9bdd263 100755 --- a/app/src/main/java/com/totsp/crossword/net/DownloadReceiverGinger.java +++ b/app/src/main/java/com/totsp/crossword/net/DownloadReceiverGinger.java @@ -1,8 +1,5 @@ package com.totsp.crossword.net; -import java.io.File; -import java.net.URI; - import android.annotation.SuppressLint; import android.app.DownloadManager; import android.app.DownloadManager.Query; @@ -13,6 +10,9 @@ import android.database.CursorIndexOutOfBoundsException; import android.net.Uri; +import java.io.File; +import java.net.URI; + public class DownloadReceiverGinger extends BroadcastReceiver { @Override @@ -22,9 +22,8 @@ public void onReceive(Context ctx, Intent intent) { .getSystemService(Context.DOWNLOAD_SERVICE); long id = intent.getLongExtra("extra_download_id", -1); - if (android.os.Build.VERSION.SDK_INT >= 11 - && !"application/x-crossword".equals(mgr - .getMimeTypeForDownloadedFile(id))) { + if (!"application/x-crossword".equals( + mgr.getMimeTypeForDownloadedFile(id))) { return; } Uri uri = null; diff --git a/app/src/main/java/com/totsp/crossword/shortyz/ShortyzApplication.java b/app/src/main/java/com/totsp/crossword/shortyz/ShortyzApplication.java index 4de92e99..737806f4 100755 --- a/app/src/main/java/com/totsp/crossword/shortyz/ShortyzApplication.java +++ b/app/src/main/java/com/totsp/crossword/shortyz/ShortyzApplication.java @@ -196,8 +196,6 @@ public static boolean isLandscape(DisplayMetrics metrics){ } public static boolean isTabletish(DisplayMetrics metrics) { - if(android.os.Build.VERSION.SDK_INT > 12) { - double x = Math.pow(metrics.widthPixels / metrics.xdpi, 2); double y = Math.pow(metrics.heightPixels / metrics.ydpi, 2); double screenInches = Math.sqrt(x + y); @@ -206,16 +204,10 @@ public static boolean isTabletish(DisplayMetrics metrics) { } else { return false; } - } else { - return false; - } } public static boolean isMiniTabletish(DisplayMetrics metrics) { switch (android.os.Build.VERSION.SDK_INT) { - case 12: - case 11: - case 13: case 14: case 15: case 16: diff --git a/app/src/main/java/com/totsp/crossword/versions/AndroidVersionUtils.java b/app/src/main/java/com/totsp/crossword/versions/AndroidVersionUtils.java index 75bd9898..0b845808 100755 --- a/app/src/main/java/com/totsp/crossword/versions/AndroidVersionUtils.java +++ b/app/src/main/java/com/totsp/crossword/versions/AndroidVersionUtils.java @@ -56,8 +56,8 @@ else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { System.out.println("Using Honeycomb"); return INSTANCE = new HoneycombUtil(); } else { - System.out.println("Using Gingerbread"); - return INSTANCE = new GingerbreadUtil(); + System.out.println("Unsupported Version"); + return INSTANCE = null; } } } diff --git a/app/src/main/java/com/totsp/crossword/versions/GingerbreadUtil.java b/app/src/main/java/com/totsp/crossword/versions/GingerbreadUtil.java deleted file mode 100755 index 3359897c..00000000 --- a/app/src/main/java/com/totsp/crossword/versions/GingerbreadUtil.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.totsp.crossword.versions; - -import android.content.Context; -import android.content.SharedPreferences; -import android.net.Uri; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.view.MenuItem; -import android.view.SubMenu; -import android.view.View; -import android.view.Window; - -import com.totsp.crossword.ShortyzActivity; -import com.totsp.crossword.net.DownloadReceiver; -import com.totsp.crossword.puz.PuzzleMeta; - - -public class GingerbreadUtil extends DefaultUtil { - protected Context ctx; - - public void setContext(Context ctx) { - this.ctx = ctx; - } - - public void finishOnHomeButton(AppCompatActivity a) { - } - - public void holographic(AppCompatActivity playActivity) { - } - - public void onActionBarWithText(MenuItem a) { - } - - public void onActionBarWithText(SubMenu reveal) { - } - - @Override - public void restoreNightMode(ShortyzActivity shortyzActivity) { - - } - - public void storeMetas(Uri uri, PuzzleMeta meta) { - DownloadReceiver.metas.put(uri, meta); - - } - - public void hideWindowTitle(AppCompatActivity a) { - a.requestWindowFeature(Window.FEATURE_NO_TITLE); - } - - public void hideActionBar(AppCompatActivity a) { - ; //no op; - } - - public void onActionBarWithoutText(MenuItem a) { - ; //no op - } - - public void hideTitleOnPortrait(AppCompatActivity a) { - - } - - @Override - public boolean isBackgroundDownloadAvaliable() { - return false; - } - - @Override - public boolean checkBackgroundDownload(SharedPreferences prefs, boolean hasWritePermissions) { - return false; - } - - @Override - public void clearBackgroundDownload(SharedPreferences prefs) { - - } - - @Override - public void createNotificationChannel(Context context) { - - } - - @Override - public void toggleNightMode(ShortyzActivity activity) { - - } - - @Override - public boolean isNightModeAvailable() { - return false; - } - - public View onActionBarCustom(AppCompatActivity a, int id) { - System.out.println("Setting custom ActionBar view"); - ActionBar bar = a.getSupportActionBar(); - if(bar == null){ - return null; - } - bar.setDisplayShowCustomEnabled(true); - bar.setDisplayShowTitleEnabled(false); - bar.setDisplayShowHomeEnabled(true); - bar.setCustomView(id); - return bar.getCustomView(); - } - -} diff --git a/app/src/main/java/com/totsp/crossword/versions/HoneycombUtil.java b/app/src/main/java/com/totsp/crossword/versions/HoneycombUtil.java index 7deb6816..ff5ed865 100755 --- a/app/src/main/java/com/totsp/crossword/versions/HoneycombUtil.java +++ b/app/src/main/java/com/totsp/crossword/versions/HoneycombUtil.java @@ -1,7 +1,10 @@ package com.totsp.crossword.versions; import android.annotation.TargetApi; +import android.content.Context; +import android.content.SharedPreferences; import android.content.res.Configuration; +import android.net.Uri; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatDelegate; @@ -11,15 +14,49 @@ import android.view.View.OnClickListener; import com.totsp.crossword.ShortyzActivity; +import com.totsp.crossword.net.DownloadReceiver; +import com.totsp.crossword.puz.PuzzleMeta; @TargetApi(11) -public class HoneycombUtil extends GingerbreadUtil { +public class HoneycombUtil extends DefaultUtil { { System.out.println("Honeycomb Utils."); } - + + + protected Context ctx; + + public void setContext(Context ctx) { + this.ctx = ctx; + } + + public void storeMetas(Uri uri, PuzzleMeta meta) { + DownloadReceiver.metas.put(uri, meta); + + } + + @Override + public boolean isBackgroundDownloadAvaliable() { + return false; + } + + @Override + public boolean checkBackgroundDownload(SharedPreferences prefs, boolean hasWritePermissions) { + return false; + } + + @Override + public void clearBackgroundDownload(SharedPreferences prefs) { + + } + + @Override + public void createNotificationChannel(Context context) { + + } + @Override public void finishOnHomeButton(final AppCompatActivity a) { ActionBar bar = a.getSupportActionBar(); diff --git a/app/src/main/java/com/totsp/crossword/view/ScrollingImageView.java b/app/src/main/java/com/totsp/crossword/view/ScrollingImageView.java index 14a75eed..0e79a25e 100755 --- a/app/src/main/java/com/totsp/crossword/view/ScrollingImageView.java +++ b/app/src/main/java/com/totsp/crossword/view/ScrollingImageView.java @@ -1,8 +1,5 @@ package com.totsp.crossword.view; -import java.util.Timer; -import java.util.logging.Logger; - import android.content.Context; import android.graphics.Bitmap; import android.util.AttributeSet; @@ -12,6 +9,9 @@ import android.widget.FrameLayout; import android.widget.ImageView; +import java.util.Timer; +import java.util.logging.Logger; + @SuppressWarnings("deprecation") public class ScrollingImageView extends FrameLayout implements OnGestureListener { @@ -35,18 +35,16 @@ public ScrollingImageView(Context context, AttributeSet as) { imageView = new ImageView(context); - if (android.os.Build.VERSION.SDK_INT >= 8) { - try { - aux = (AuxTouchHandler) Class.forName("com.totsp.crossword.view.MultitouchHandler") - .newInstance(); - aux.init(this); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } + try { + aux = (AuxTouchHandler) Class.forName("com.totsp.crossword.view.MultitouchHandler") + .newInstance(); + aux.init(this); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); } } diff --git a/app/src/main/java/com/totsp/crossword/view/recycler/ScrollDetector.java b/app/src/main/java/com/totsp/crossword/view/recycler/ScrollDetector.java index ec784371..90689ffb 100755 --- a/app/src/main/java/com/totsp/crossword/view/recycler/ScrollDetector.java +++ b/app/src/main/java/com/totsp/crossword/view/recycler/ScrollDetector.java @@ -1,11 +1,10 @@ package com.totsp.crossword.view.recycler; import android.content.Context; - import android.os.Build; - import android.view.GestureDetector; - import android.view.MotionEvent; - import android.view.View; - import android.view.ViewConfiguration; +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewConfiguration; public abstract class ScrollDetector extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener { private final GestureDetector mDetector; @@ -29,12 +28,7 @@ public ScrollDetector(Context context) { } protected int getSlop(Context context) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) { - //noinspection deprecation - return ViewConfiguration.getTouchSlop() * 2; - } else { - return ViewConfiguration.get(context).getScaledPagingTouchSlop(); - } + return ViewConfiguration.get(context).getScaledPagingTouchSlop(); } @Override