添加调试信息

app/src/main/java/cc/winboll/gallery/Album.java

@@ -1,6 +1,7 @@
 package cc.winboll.gallery;
 
 import android.net.Uri;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class Album {
     public static final String TAG = "Album";
@@ -10,6 +11,7 @@ public class Album {
     private int imageCount;
 
     public Album(String name, String path, Uri coverUri, int imageCount) {
+        LogUtils.d(TAG, "Album created: " + name);
         this.name = name;
         this.path = path;
         this.coverUri = coverUri;

app/src/main/java/cc/winboll/gallery/AlbumActivity.java

@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.gallery.ImageAdapter.OnImageClickListener;
 
 public class AlbumActivity extends AppCompatActivity {
@@ -34,6 +35,7 @@ public class AlbumActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
         
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -91,6 +93,7 @@ public class AlbumActivity extends AppCompatActivity {
     }
 
     private void loadImages() {
+        LogUtils.d(TAG, "loadImages");
         ArrayList<Uri> imageUrls = new ArrayList<>();
         ArrayList<String> imagePaths = new ArrayList<>();
         ContentResolver contentResolver = getContentResolver();
@@ -117,8 +120,10 @@ public class AlbumActivity extends AppCompatActivity {
         
         if (imageUrls.isEmpty()) {
             Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No images found");
         }
         adapter.setData(imageUrls, imagePaths);
+        LogUtils.d(TAG, "Loaded " + imageUrls.size() + " images");
     }
 
     @Override

app/src/main/java/cc/winboll/gallery/AlbumAdapter.java

@@ -11,6 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder> {
     public static final String TAG = "AlbumAdapter";
     private ArrayList<Album> albums = new ArrayList<>();
@@ -26,6 +28,7 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
 
     public void setData(ArrayList<Album> albums) {
         this.albums = albums;
+        LogUtils.d(TAG, "setData: " + albums.size() + " albums");
         notifyDataSetChanged();
     }
 

app/src/main/java/cc/winboll/gallery/GlobalWinBoLLApplication.java

@@ -2,6 +2,7 @@ package cc.winboll.gallery;
 
 import cc.winboll.studio.libaes.utils.WinBoLLActivityManager;
 import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.ToastUtils;
 
 /**
@@ -16,6 +17,7 @@ public class GlobalWinBoLLApplication extends GlobalApplication {
 @Override
     public void onCreate() {
         super.onCreate();
+        LogUtils.d(TAG, "onCreate");
         setIsDebugging(BuildConfig.DEBUG);
         //setIsDebugging(false);
 
@@ -35,6 +37,7 @@ public class GlobalWinBoLLApplication extends GlobalApplication {
 @Override
     public void onTerminate() {
         super.onTerminate();
+        LogUtils.d(TAG, "onTerminate");
         ToastUtils.release();
     }
     

app/src/main/java/cc/winboll/gallery/ImageAdapter.java

@@ -11,6 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder> {
     public static final String TAG = "ImageAdapter";
     private ArrayList<Uri> imageUrls = new ArrayList<>();
@@ -28,6 +30,7 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
     public void setData(ArrayList<Uri> urls, ArrayList<String> paths) {
         this.imageUrls = urls;
         this.imagePaths = paths;
+        LogUtils.d(TAG, "setData: " + urls.size() + " images");
         notifyDataSetChanged();
     }
 

app/src/main/java/cc/winboll/gallery/ImagePagerAdapter.java

@@ -11,12 +11,15 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class ImagePagerAdapter extends PagerAdapter {
     public static final String TAG = "ImagePagerAdapter";
     private ArrayList<Uri> imageUrls;
 
     public ImagePagerAdapter(ArrayList<Uri> imageUrls) {
         this.imageUrls = imageUrls;
+        LogUtils.d(TAG, "ImagePagerAdapter created with " + imageUrls.size() + " images");
     }
 
     @Override

app/src/main/java/cc/winboll/gallery/ImageViewerActivity.java

@@ -16,6 +16,8 @@ import androidx.viewpager.widget.ViewPager;
 import java.io.File;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class ImageViewerActivity extends Activity implements ViewPager.OnPageChangeListener {
     public static final String TAG = "ImageViewerActivity";
     public static final String EXTRA_IMAGE_URLS = "image_urls";
@@ -39,6 +41,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
             WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_image_viewer);
+        LogUtils.d(TAG, "onCreate");
         
         imageUrls = getIntent().getParcelableArrayListExtra(EXTRA_IMAGE_URLS);
         imagePaths = getIntent().getStringArrayListExtra(EXTRA_POSITIONS);
@@ -116,6 +119,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
     }
     
     private void moveToTrash() {
+        LogUtils.d(TAG, "moveToTrash");
         if (currentPosition >= 0 && currentPosition < imageUrls.size()) {
             String imagePath = "";
             if (imagePaths != null && currentPosition < imagePaths.size()) {
@@ -138,6 +142,7 @@ public class ImageViewerActivity extends Activity implements ViewPager.OnPageCha
                     e.printStackTrace();
                 }
                 android.widget.Toast.makeText(this, "Moved to trash", android.widget.Toast.LENGTH_SHORT).show();
+                LogUtils.i(TAG, "Moved to trash");
                 removeCurrentImage();
             } else {
                 try {

app/src/main/java/cc/winboll/gallery/MainActivity.java

@@ -22,6 +22,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.gallery.AlbumAdapter.OnAlbumClickListener;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogActivity;
 import java.io.File;
 import java.io.FileFilter;
@@ -39,6 +40,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
         
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -64,6 +66,7 @@ public class MainActivity extends AppCompatActivity {
     }
     
     private void checkAndRequestPermissions() {
+        LogUtils.i(TAG, "checkAndRequestPermissions");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             if (!Environment.isExternalStorageManager()) {
                 try {
@@ -127,6 +130,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     private void loadAlbums() {
+        LogUtils.d(TAG, "loadAlbums");
         String folderPath = prefs.getFolderPath();
         File baseFolder = new File(folderPath);
         
@@ -160,8 +164,10 @@ public class MainActivity extends AppCompatActivity {
         
         if (albums.isEmpty()) {
             Toast.makeText(this, R.string.no_images_found, Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "No albums found");
         }
         adapter.setData(albums);
+        LogUtils.d(TAG, "Loaded " + albums.size() + " albums");
     }
 
     private ArrayList<Uri> getImagesInFolder(String folderPath) {

app/src/main/java/cc/winboll/gallery/Preferences.java

@@ -2,6 +2,7 @@ package cc.winboll.gallery;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class Preferences {
     public static final String TAG = "Preferences";
@@ -20,10 +21,13 @@ public class Preferences {
     }
     
     public String getFolderPath() {
-        return prefs.getString(KEY_FOLDER_PATH, DEFAULT_PATH);
+        String path = prefs.getString(KEY_FOLDER_PATH, DEFAULT_PATH);
+        LogUtils.d(TAG, "getFolderPath: " + path);
+        return path;
     }
     
     public void setFolderPath(String path) {
+        LogUtils.d(TAG, "setFolderPath: " + path);
         prefs.edit().putString(KEY_FOLDER_PATH, path).apply();
     }
 }

app/src/main/java/cc/winboll/gallery/SettingsActivity.java

@@ -7,6 +7,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class SettingsActivity extends AppCompatActivity {
     public static final String TAG = "SettingsActivity";
@@ -18,6 +19,7 @@ public class SettingsActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
+        LogUtils.d(TAG, "onCreate");
         
         prefs = new Preferences(this);
         

app/src/main/java/cc/winboll/gallery/TrashActivity.java

@@ -20,6 +20,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.io.File;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class TrashActivity extends AppCompatActivity {
     public static final String TAG = "TrashActivity";
     private static final int PERMISSION_REQUEST_CODE = 102;
@@ -31,6 +33,7 @@ public class TrashActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        LogUtils.d(TAG, "onCreate");
         
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -87,6 +90,7 @@ public class TrashActivity extends AppCompatActivity {
     }
 
     private void loadTrash() {
+        LogUtils.d(TAG, "loadTrash");
         Cursor cursor = trashManager.getTrashList();
         ArrayList<TrashItem> items = new ArrayList<TrashItem>();
         ArrayList<Uri> uris = new ArrayList<Uri>();
@@ -129,12 +133,14 @@ public class TrashActivity extends AppCompatActivity {
     }
 
     private void restoreImage(int position) {
+        LogUtils.d(TAG, "restoreImage: " + position);
         long id = adapter.getItemId(position);
         String fileName = adapter.getFileName(position);
         String originalPath = adapter.getOriginalPath(position);
         
         if (trashManager.restore(id, fileName, originalPath)) {
             Toast.makeText(this, "Image restored", Toast.LENGTH_SHORT).show();
+            LogUtils.i(TAG, "Image restored");
             loadTrash();
         } else {
             Toast.makeText(this, "Restore failed", Toast.LENGTH_SHORT).show();

app/src/main/java/cc/winboll/gallery/TrashAdapter.java

@@ -11,6 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import java.util.ArrayList;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class TrashAdapter extends RecyclerView.Adapter<TrashAdapter.ViewHolder> {
     public static final String TAG = "TrashAdapter";
     private ArrayList<TrashActivity.TrashItem> trashItems = new ArrayList<TrashActivity.TrashItem>();
@@ -29,6 +31,7 @@ public class TrashAdapter extends RecyclerView.Adapter<TrashAdapter.ViewHolder>
     public void setData(ArrayList<TrashActivity.TrashItem> items, ArrayList<Uri> uris) {
         this.trashItems = items;
         this.imageUrls = uris;
+        LogUtils.d(TAG, "setData: " + items.size() + " items");
         notifyDataSetChanged();
     }
 

app/src/main/java/cc/winboll/gallery/TrashDbHelper.java

@@ -8,6 +8,8 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Environment;
 import java.io.File;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class TrashDbHelper extends SQLiteOpenHelper {
     public static final String TAG = "TrashDbHelper";
     private static final String DB_NAME = "trash.db";
@@ -25,6 +27,7 @@ public class TrashDbHelper extends SQLiteOpenHelper {
     
     @Override
     public void onCreate(SQLiteDatabase db) {
+        LogUtils.d(TAG, "onCreate");
         db.execSQL("CREATE TABLE " + TABLE_NAME + " (" +
             COL_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
             COL_FILE_NAME + " TEXT, " +
@@ -35,6 +38,7 @@ public class TrashDbHelper extends SQLiteOpenHelper {
     
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        LogUtils.i(TAG, "onUpgrade: " + oldVersion + " -> " + newVersion);
         db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
         onCreate(db);
     }

app/src/main/java/cc/winboll/gallery/TrashManager.java

@@ -7,17 +7,21 @@ import android.provider.MediaStore;
 import java.io.File;
 import java.util.UUID;
 
+import cc.winboll.studio.libappbase.LogUtils;
+
 public class TrashManager {
     public static final String TAG = "TrashManager";
     private final Context context;
     private final TrashDbHelper dbHelper;
     
     public TrashManager(Context context) {
+        LogUtils.d(TAG, "TrashManager created");
         this.context = context;
         this.dbHelper = new TrashDbHelper(context);
     }
     
     public long addToTrash(String imagePath) {
+        LogUtils.d(TAG, "addToTrash: " + imagePath);
         File sourceFile = new File(imagePath);
         if (!sourceFile.exists()) {
             return -1;
@@ -32,8 +36,10 @@ public class TrashManager {
         if (sourceFile.renameTo(destFile)) {
             String originalFolder = sourceFile.getParent();
             long result = dbHelper.insert(newFileName, imagePath, originalFolder);
+            LogUtils.i(TAG, "Added to trash: " + newFileName);
             return result;
         }
+        LogUtils.e(TAG, "Failed to move to trash");
         return -1;
     }
     
@@ -42,6 +48,7 @@ public class TrashManager {
     }
     
     public boolean restore(long id, String fileName, String originalPath) {
+        LogUtils.i(TAG, "restore: " + fileName + " -> " + originalPath);
         File trashFile = new File(TrashDbHelper.getTrashPath(), fileName);
         if (!trashFile.exists()) {
             return false;
@@ -58,9 +65,11 @@ public class TrashManager {
         
         if (trashFile.renameTo(restoreFile)) {
             dbHelper.delete(id);
+            LogUtils.i(TAG, "Restored: " + fileName);
             return true;
         }
         
+        LogUtils.e(TAG, "Failed to restore: " + fileName);
         return false;
     }