V2.7.0 - Fix download/set wallpaper + QOL Changes

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### v2.7.0
+- Temporarily removed themes for now
+- Fix download and set wall bugs
+
 ### v2.6.9
 - Laid support for Prism v3
 - New model for users

README.md

@@ -141,6 +141,10 @@ You can also report bugs, upload your setups/walls on our telegram channel
 
 Full changelog can be found [here](https://github.com/Hash-Studios/Prism/tree/master/CHANGELOG.md).
 
+### v2.7.0
+- Temporarily removed themes for now
+- Fix download and set wall bugs
+
 ### v2.6.9
 - Laid support for Prism v3
 - New model for users

android/app/build.gradle

@@ -31,7 +31,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
    }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     lintOptions {
         disable 'InvalidPackage'
@@ -40,8 +40,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.hash.prism"
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hash.prism" >
+    package="com.hash.prism"
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -13,11 +14,13 @@
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:icon="@mipmap/ic_launcher"
+        tools:replace="android:name"
         android:label="Prism" >
         <service
             android:name=".MyTileService"
             android:icon="@drawable/preview_widget"
             android:label="@string/quick_settings"
+            android:exported="true"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
 
             <intent-filter>
@@ -30,6 +33,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -84,6 +88,9 @@
  Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
         -->
+         <provider android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider" android:authorities="${applicationId}.flutter_downloader.provider" android:exported="false" android:grantUriPermissions="true">
+      <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths" />
+    </provider>
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />

android/app/src/main/java/com/hash/Prism/MainActivity.java

@@ -38,71 +38,7 @@
 public class MainActivity extends FlutterActivity {
     private static final String CHANNEL = "flutter.prism.set_wallpaper";
     public static MethodChannel.Result res;
-    private Target target = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap resource, Picasso.LoadedFrom from) {
-            android.util.Log.i("Arguments ", "configureFlutterEngine: " + "Image Downloaded");
-            SetWallPaperTask setWallPaperTask = new SetWallPaperTask(getActivity());
-            setWallPaperTask.execute(new Pair(resource, "1"));
-        }
-
-        @Override
-        public void onBitmapFailed(Exception e, Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-    private Target target1 = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap resource, Picasso.LoadedFrom from) {
-            android.util.Log.i("Arguments ", "configureFlutterEngine: " + "Image Downloaded");
-            SetWallPaperTask setWallPaperTask = new SetWallPaperTask(getActivity());
-            setWallPaperTask.execute(new Pair(resource, "2"));
-        }
-
-        @Override
-        public void onBitmapFailed(Exception e, Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-    private Target target2 = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap resource, Picasso.LoadedFrom from) {
-            android.util.Log.i("Arguments ", "configureFlutterEngine: " + "Image Downloaded");
-            SetWallPaperTask setWallPaperTask = new SetWallPaperTask(getActivity());
-            setWallPaperTask.execute(new Pair(resource, "3"));
-        }
-
-        @Override
-        public void onBitmapFailed(Exception e, Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-    private Target target3 = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap resource, Picasso.LoadedFrom from) {
-            android.util.Log.i("Arguments ", "configureFlutterEngine: " + "Image Downloaded");
-            SetWallPaperTask setWallPaperTask = new SetWallPaperTask(getActivity());
-            setWallPaperTask.execute(new Pair(resource, "4"));
-        }
-
-        @Override
-        public void onBitmapFailed(Exception e, Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-
+
     Target saveImageTarget = new Target() {
         @Override
         public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
@@ -154,47 +90,7 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
         new MethodChannel(flutterEngine.getDartExecutor().getBinaryMessenger(), CHANNEL)
                 .setMethodCallHandler((call, result) -> {
                     res = result;
-                    if (call.method.equals("set_wallpaper")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load(url).into(target);
-
-                    } else if (call.method.equals("set_wallpaper_file")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load("file://" + url).into(target);
-
-                    } else if (call.method.equals("set_lock_wallpaper")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load(url).into(target1);
-
-                    } else if (call.method.equals("set_home_wallpaper")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load(url).into(target2);
-
-                    } else if (call.method.equals("set_both_wallpaper")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load(url).into(target3);
-
-                    } else if (call.method.equals("set_lock_wallpaper_file")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load("file://" + url).into(target1);
-
-                    } else if (call.method.equals("set_home_wallpaper_file")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load("file://" + url).into(target2);
-
-                    } else if (call.method.equals("set_both_wallpaper_file")) {
-                        String url = call.argument("url"); // .argument returns the correct type
-                        android.util.Log.i("Arguments ", "configureFlutterEngine: " + url);
-                        Picasso.get().load("file://" + url).into(target3);
-
-                    } else if (call.method.equals("save_image")) {
+                    if (call.method.equals("save_image")) {
                         String link = call.argument("link");
                         Picasso.get().load(link).into(saveImageTarget);
                     } else if (call.method.equals("save_image_file")) {
@@ -203,33 +99,10 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
                     } else if (call.method.equals("save_setup")) {
                         String link = call.argument("link");
                         Picasso.get().load(link).into(saveSetupTarget);
-                    } else if (call.method.equals("download_image_dm")) {
-                        String link = call.argument("link");
-                        String filename = call.argument("filename");
-                        downloadImageNew(filename,link);
                     }
                 });
     }
 
-    private void downloadImageNew(String filename, String downloadUrlOfImage){
-        try{
-            DownloadManager dm = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
-            Uri downloadUri = Uri.parse(downloadUrlOfImage);
-            DownloadManager.Request request = new DownloadManager.Request(downloadUri);
-            request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE)
-                    .setAllowedOverRoaming(false)
-                    .setTitle(filename)
-                    .setDescription("Downloading wallpaper")
-                    .setMimeType("image/jpeg") // Your file type. You can use this code to download other file types also.
-                    .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-                    .setDestinationInExternalPublicDir(Environment.DIRECTORY_PICTURES,File.separator + "Prism"+ File.separator + filename + ".jpg");
-            dm.enqueue(request);
-            Toast.makeText(this, "Image download started.", Toast.LENGTH_SHORT).show();
-        }catch (Exception e){
-            Toast.makeText(this, "Image download failed." + e.getMessage().toString(), Toast.LENGTH_SHORT).show();
-        }
-    }
-
     private void saveImageToPictures(Bitmap bitmap, @NonNull String name) throws IOException {
         OutputStream fos;
         try {
@@ -254,141 +127,4 @@ private void saveImageToPictures(Bitmap bitmap, @NonNull String name) throws IOE
         }
         res.success(true);
     }
-}
-
-
-class SetWallPaperTask extends AsyncTask<Pair<Bitmap, String>, Boolean, Boolean> {
-
-    private final Context mContext;
-
-    public SetWallPaperTask(final Context context) {
-        mContext = context;
-    }
-
-    @Override
-    protected final Boolean doInBackground(Pair<Bitmap, String>... pairs) {
-        switch (pairs[0].second) {
-            case "1": {
-                WallpaperManager wallpaperManager = WallpaperManager.getInstance(mContext);
-                try {
-                    Uri tempUri = getImageUri(mContext, pairs[0].first);
-                    Log.i("Arguments ", "configureFlutterEngine: " + "Saved image to storage");
-                    File finalFile = new File(getRealPathFromURI(tempUri));
-                    Uri contentURI = getImageContentUri(mContext, finalFile.getAbsolutePath());
-                    Log.i("Arguments ", "configureFlutterEngine: " + "Opening crop intent");
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                        mContext.startActivity(wallpaperManager.getCropAndSetWallpaperIntent(contentURI));
-                    }
-                    // wallpaperManager.setBitmap(pairs[0].first);
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                    return false;
-                }
-            }
-            case "2": {
-                WallpaperManager wallpaperManager = WallpaperManager.getInstance(mContext);
-                try {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        wallpaperManager.setBitmap(pairs[0].first, null, true, WallpaperManager.FLAG_LOCK);
-                    }
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                    return false;
-                }
-                break;
-            }
-            case "3": {
-                WallpaperManager wallpaperManager = WallpaperManager.getInstance(mContext);
-                try {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        wallpaperManager.setBitmap(pairs[0].first, null, true, WallpaperManager.FLAG_SYSTEM);
-                    }
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                    return false;
-                }
-                break;
-            }
-            case "4": {
-                WallpaperManager wallpaperManager = WallpaperManager.getInstance(mContext);
-                try {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        wallpaperManager.setBitmap(pairs[0].first, null, true,
-                                WallpaperManager.FLAG_LOCK | WallpaperManager.FLAG_SYSTEM);
-                    }
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                    return false;
-                }
-                break;
-            }
-
-        }
-                return true;
-    }
-
-    @Override
-    protected void onCancelled() {
-        super.onCancelled();
-    }
-
-    @Override
-    protected void onPostExecute(Boolean aBoolean) {
-        myMethod(aBoolean);
-    }
-
-    private void myMethod(Boolean result) {
-        MainActivity.res.success(result);
-    }
-
-    public static Uri getImageContentUri(Context context, String absPath) {
-
-        Cursor cursor = context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                new String[]{MediaStore.Images.Media._ID}, MediaStore.Images.Media.DATA + "=? ",
-                new String[]{absPath}, null);
-
-        if (cursor != null && cursor.moveToFirst()) {
-            int id = cursor.getInt(cursor.getColumnIndex(MediaStore.MediaColumns._ID));
-            return Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, Integer.toString(id));
-
-        } else if (!absPath.isEmpty()) {
-            ContentValues values = new ContentValues();
-            values.put(MediaStore.Images.Media.DATA, absPath);
-            return context.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-        } else {
-            return null;
-        }
-    }
-
-    public Uri getImageUri(Context inContext, Bitmap inImage) {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-        inImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
-        fixMediaDir();
-        String path = MediaStore.Images.Media.insertImage(inContext.getContentResolver(), inImage, "Title", null);
-        return Uri.parse(path);
-    }
-
-    public String getRealPathFromURI(Uri uri) {
-        Cursor cursor = mContext.getContentResolver().query(uri, null, null, null, null);
-        cursor.moveToFirst();
-        int idx = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
-        return cursor.getString(idx);
-    }
-
-    void fixMediaDir() {
-        File sdcard = Environment.getExternalStorageDirectory();
-        if (sdcard != null) {
-            File mediaDir = new File(sdcard, "DCIM/Camera");
-            if (!mediaDir.exists()) {
-                mediaDir.mkdirs();
-            }
-        }
-
-        if (sdcard != null) {
-            File mediaDir = new File(sdcard, "Pictures");
-            if (!mediaDir.exists()) {
-                mediaDir.mkdirs();
-            }
-        }
-    }
 }

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath 'io.fabric.tools:gradle:1.26.1'
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"