From 305a40c8c567bd5d5c6ac0b043ee92934e4f0fcf Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Mon, 5 Sep 2016 20:42:57 +0200 Subject: [PATCH 1/3] Added some experimental changes to keep the webview on orientation changes --- app/src/main/AndroidManifest.xml | 1 + .../activity/MainActivity.java | 48 +++++++++++++++++-- .../dfa/diaspora_android/util/Helpers.java | 22 +++++++++ app/src/main/res/layout/main__content.xml | 6 +-- app/src/main/res/layout/webview.xml | 13 +++++ 5 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/layout/webview.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 96e0a844..8a35ba68 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -54,6 +54,7 @@ android:name=".activity.MainActivity" android:launchMode="singleInstance" android:windowSoftInputMode="adjustPan" + android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/AppTheme.NoActionBar" android:label="@string/diaspora"> diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index cedaad59..c13255ca 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -31,6 +31,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.graphics.Bitmap; import android.net.Uri; import android.os.Bundle; @@ -52,6 +53,7 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -64,6 +66,7 @@ import android.webkit.WebChromeClient; import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; @@ -145,7 +148,9 @@ public class MainActivity extends AppCompatActivity @BindView(R.id.toolbar2) ActionMenuView toolbarBottom; - @BindView(R.id.webView) + @BindView(R.id.placeholder_webview) + FrameLayout webviewPlaceholder; + ContextMenuWebView webView; @BindView(R.id.main__navigaion_view) @@ -169,10 +174,10 @@ public class MainActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Log.d(App.TAG, "onCreate"); // Bind UI setContentView(R.layout.main__activity); - ButterKnife.bind(this); app = (App) getApplication(); appSettings = app.getSettings(); @@ -189,8 +194,23 @@ public class MainActivity extends AppCompatActivity resetProxy(); } - setupWebView(savedInstanceState); + setupUI(savedInstanceState); + } + private void setupUI(Bundle savedInstanceState) { + boolean newWebView = (webView == null); + if(newWebView) { + Log.d(App.TAG, "Webview was null. Create new one."); + View webviewHolder = getLayoutInflater().inflate(R.layout.webview, null); + webView = (ContextMenuWebView) webviewHolder.findViewById(R.id.webView); + ((LinearLayout)webView.getParent()).removeView(webView); + setupWebView(savedInstanceState); + } + ButterKnife.bind(this); + if (webviewPlaceholder.getChildCount() != 0) { + webviewPlaceholder.removeAllViews(); + } + webviewPlaceholder.addView(webView); // Setup toolbar setSupportActionBar(toolbarTop); getMenuInflater().inflate(R.menu.main__menu_bottom, toolbarBottom.getMenu()); @@ -231,8 +251,9 @@ public class MainActivity extends AppCompatActivity progressBar = (ProgressBar) findViewById(R.id.progressBar); String url = urls.getPodUrl(); - if (savedInstanceState == null) { + if (newWebView) { if (WebHelper.isOnline(MainActivity.this)) { + Log.d(App.TAG, "setupUI: reload url"); webView.loadData("", "text/html", null); webView.loadUrlNew(url); } else { @@ -248,6 +269,24 @@ public class MainActivity extends AppCompatActivity handleIntent(getIntent()); } + @Override + public void onConfigurationChanged(Configuration newConfig) + { + if (webView != null) + { + // Remove the WebView from the old placeholder + webviewPlaceholder.removeView(webView); + } + + super.onConfigurationChanged(newConfig); + + // Load the layout resource for the new configuration + setContentView(R.layout.main__activity); + + // Reinitialize the UI + setupUI(null); + } + private void setupWebView(Bundle savedInstanceState) { webSettings = webView.getSettings(); @@ -519,6 +558,7 @@ public class MainActivity extends AppCompatActivity @Override protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) { + Helpers.printBundle(savedInstanceState,""); super.onRestoreInstanceState(savedInstanceState); webView.restoreState(savedInstanceState); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java index 8a5988c9..e6202016 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java @@ -22,7 +22,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.os.Bundle; import android.os.Environment; +import android.util.Log; import com.github.dfa.diaspora_android.R; @@ -31,8 +33,10 @@ import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import java.util.Locale; +import java.util.Objects; public class Helpers { @@ -97,4 +101,22 @@ public class Helpers { public static String hexColorFromRessourceColor(Context context, int idColor){ return "#" + Integer.toHexString(context.getResources().getColor(idColor) & 0x00ffffff); } + + public static void printBundle(Bundle savedInstanceState, String k) { + if(savedInstanceState != null) { + for (String key : savedInstanceState.keySet()) { + Log.d("SAVED", key + " is a key in the bundle "+k); + Object bun = savedInstanceState.get(key); + if(bun != null) { + if (bun instanceof Bundle) { + printBundle((Bundle) bun, k + "." + key); + } else if (bun instanceof byte[]) { + Log.d("SAVED", "Key: "+k + "." + key+": "+ Arrays.toString((byte[])bun)); + } else { + Log.d("SAVED", "Key: "+k + "." + key+": "+ bun.toString()); + } + } + } + } + } } diff --git a/app/src/main/res/layout/main__content.xml b/app/src/main/res/layout/main__content.xml index 06dd0e41..a50f9875 100644 --- a/app/src/main/res/layout/main__content.xml +++ b/app/src/main/res/layout/main__content.xml @@ -9,13 +9,13 @@ tools:context=".activity.MainActivity" tools:showIn="@layout/main__app_bar"> - + android:layout_centerVertical="true"/> + + + + \ No newline at end of file From 7dbfb10229a11d3ba643f845b6f0b31daa90d885 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 7 Sep 2016 23:12:17 +0200 Subject: [PATCH 2/3] Added permission check to FileChooser and added missing file choosing method for Android 4.2 WIP WARNING --- .../activity/MainActivity.java | 66 +++++++++++++++++-- .../dfa/diaspora_android/util/Helpers.java | 8 ++- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 68 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index c13255ca..91c9e397 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -34,6 +34,7 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Handler; @@ -351,10 +352,59 @@ public class MainActivity extends AppCompatActivity progressBar.setVisibility(progress == 100 ? View.GONE : View.VISIBLE); } + //For Android 4.1/4.2 only. DONT REMOVE + protected void openFileChooser(ValueCallback uploadMsg, String acceptType, String capture) + { + Log.d(App.TAG, "openFileChooser(ValCallback, String, String"); + mFilePathCallback = uploadMsg; + Intent intent = new Intent(); + intent.setType("image/*"); + intent.setAction(Intent.ACTION_GET_CONTENT); + intent.putExtra("return-data", true); + startActivityForResult(Intent.createChooser(intent, "Select Picture"),INPUT_FILE_REQUEST_CODE); + } + //For Android 4.1/4.2 only. DONT REMOVE + protected void openFileChooser(ValueCallback uploadMsg) + { + Log.d(App.TAG, "openFileChooser(ValCallback"); + onShowFileChooser(webView, uploadMsg, null); + /* + mUploadMessage = uploadMsg; + Intent i = new Intent(Intent.ACTION_GET_CONTENT); + i.addCategory(Intent.CATEGORY_OPENABLE); + i.setType("image/*"); + startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE); + */ + } + @Override public boolean onShowFileChooser(WebView webView, ValueCallback filePathCallback, FileChooserParams fileChooserParams) { - if (mFilePathCallback != null) mFilePathCallback.onReceiveValue(null); + if(Build.VERSION.SDK_INT >= 23) { + int hasWRITE_EXTERNAL_STORAGE = checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE); + if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) { + if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + new AlertDialog.Builder(MainActivity.this) + .setMessage(R.string.permissions_image) + .setNegativeButton(android.R.string.no, null) + .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (android.os.Build.VERSION.SDK_INT >= 23) + requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, + REQUEST_CODE_ASK_PERMISSIONS); + } + }) + .show(); + return false; + } + requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, + REQUEST_CODE_ASK_PERMISSIONS); + return false; + } + } + Log.d(App.TAG, "onOpenFileChooser"); + if (mFilePathCallback != null) mFilePathCallback.onReceiveValue(null); mFilePathCallback = filePathCallback; Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -365,6 +415,7 @@ public class MainActivity extends AppCompatActivity photoFile = Helpers.createImageFile(); takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath); } catch (IOException ex) { + Log.e(App.TAG, "ERROR creating temp file: "+ ex.toString()); // Error occurred while creating the File Snackbar.make(contentLayout, R.string.unable_to_load_image, Snackbar.LENGTH_LONG).show(); return false; @@ -396,6 +447,7 @@ public class MainActivity extends AppCompatActivity chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser"); chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray); + Log.d(App.TAG,"startActivityForResult"); startActivityForResult(chooserIntent, INPUT_FILE_REQUEST_CODE); return true; } @@ -528,26 +580,32 @@ public class MainActivity extends AppCompatActivity @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { + Log.d(App.TAG,"onActivityResult:"); if (requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) { + Log.d(App.TAG,"reqCode != INPUT_FILE_REQUEST_CODE or mFilePathCallback == null"); super.onActivityResult(requestCode, resultCode, data); return; } Uri[] results = null; if (resultCode == Activity.RESULT_OK) { + Log.d(App.TAG, "Activity.RESULT_OK"); if (data == null) { + Log.d(App.TAG, "data == null"); if (mCameraPhotoPath != null) { + Log.d(App.TAG, "mCameraPhotoPath != null"); results = new Uri[]{Uri.parse(mCameraPhotoPath)}; } } else { + Log.d(App.TAG, "data != null"); String dataString = data.getDataString(); if (dataString != null) { + Log.d(App.TAG, "dataString != null"); results = new Uri[]{Uri.parse(dataString)}; } } + mFilePathCallback.onReceiveValue(results); + mFilePathCallback = null; } - - mFilePathCallback.onReceiveValue(results); - mFilePathCallback = null; } @Override diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java index e6202016..1db486f2 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java @@ -26,6 +26,7 @@ import android.os.Bundle; import android.os.Environment; import android.util.Log; +import com.github.dfa.diaspora_android.App; import com.github.dfa.diaspora_android.R; import java.io.BufferedReader; @@ -62,12 +63,13 @@ public class Helpers { // Create an image file name String timeStamp = new SimpleDateFormat("dd-MM-yy_HH-mm", Locale.getDefault()).format(new Date()); String imageFileName = "JPEG_" + timeStamp + "_"; + Log.d(App.TAG, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath()); File storageDir = Environment.getExternalStoragePublicDirectory( Environment.DIRECTORY_PICTURES); - return File.createTempFile( - imageFileName, /* prefix */ + return new File ( + imageFileName + /* prefix */ ".jpg", /* suffix */ - storageDir /* directory */ + storageDir.getAbsolutePath() /* directory */ ); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d60fa0f..57a761b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,7 +97,7 @@ completely close the app or restart the device. If you don\'t permit the storage access but want to use the screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps - Diaspora. In the permissions section you can grant the \"write storage permission\". - You must grant \"Access Storage Permission\" to save images. After that you should + You must grant \"Access Storage Permission\" to save/upload images. After that you should completely close the app or restart the device. If you don\'t permit the storage access but want to save images at a later time, you can grant the permission later. Please open then: systemsettings - apps - Diaspora. In the permissions section you can grant the \"write storage permission\". From e6446217a88eacc858d7fb4818984aa8ccd787ef Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Wed, 7 Sep 2016 23:55:25 +0200 Subject: [PATCH 3/3] Fixed image upload on 4.2 devices --- app/src/main/AndroidManifest.xml | 2 +- .../activity/MainActivity.java | 100 ++++++++++-------- 2 files changed, 56 insertions(+), 46 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a35ba68..a4b02fa7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -52,7 +52,7 @@ mFilePathCallback; + private ValueCallback imageUploadFilePathCallbackNew; + private ValueCallback imageUploadFilePathCallbackOld; private String mCameraPhotoPath; private WebSettings webSettings; private AppSettings appSettings; @@ -353,28 +353,16 @@ public class MainActivity extends AppCompatActivity } //For Android 4.1/4.2 only. DONT REMOVE - protected void openFileChooser(ValueCallback uploadMsg, String acceptType, String capture) + protected void openFileChooser(ValueCallback uploadMsg, String acceptType, String capture) { - Log.d(App.TAG, "openFileChooser(ValCallback, String, String"); - mFilePathCallback = uploadMsg; + Log.d(App.TAG, "openFileChooser(ValCallback, String, String"); + imageUploadFilePathCallbackOld = uploadMsg; Intent intent = new Intent(); intent.setType("image/*"); intent.setAction(Intent.ACTION_GET_CONTENT); intent.putExtra("return-data", true); - startActivityForResult(Intent.createChooser(intent, "Select Picture"),INPUT_FILE_REQUEST_CODE); - } - //For Android 4.1/4.2 only. DONT REMOVE - protected void openFileChooser(ValueCallback uploadMsg) - { - Log.d(App.TAG, "openFileChooser(ValCallback"); - onShowFileChooser(webView, uploadMsg, null); - /* - mUploadMessage = uploadMsg; - Intent i = new Intent(Intent.ACTION_GET_CONTENT); - i.addCategory(Intent.CATEGORY_OPENABLE); - i.setType("image/*"); - startActivityForResult(Intent.createChooser(i, "File Chooser"), FILECHOOSER_RESULTCODE); - */ + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + startActivityForResult(Intent.createChooser(intent, "Select Picture"), INPUT_FILE_REQUEST_CODE_OLD); } @Override @@ -404,8 +392,8 @@ public class MainActivity extends AppCompatActivity } Log.d(App.TAG, "onOpenFileChooser"); - if (mFilePathCallback != null) mFilePathCallback.onReceiveValue(null); - mFilePathCallback = filePathCallback; + if (imageUploadFilePathCallbackNew != null) imageUploadFilePathCallbackNew.onReceiveValue(null); + imageUploadFilePathCallbackNew = filePathCallback; Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); if (takePictureIntent.resolveActivity(getPackageManager()) != null) { @@ -448,7 +436,7 @@ public class MainActivity extends AppCompatActivity chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray); Log.d(App.TAG,"startActivityForResult"); - startActivityForResult(chooserIntent, INPUT_FILE_REQUEST_CODE); + startActivityForResult(chooserIntent, INPUT_FILE_REQUEST_CODE_NEW); return true; } }); @@ -581,31 +569,53 @@ public class MainActivity extends AppCompatActivity @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { Log.d(App.TAG,"onActivityResult:"); - if (requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) { - Log.d(App.TAG,"reqCode != INPUT_FILE_REQUEST_CODE or mFilePathCallback == null"); - super.onActivityResult(requestCode, resultCode, data); - return; - } - Uri[] results = null; - if (resultCode == Activity.RESULT_OK) { - Log.d(App.TAG, "Activity.RESULT_OK"); - if (data == null) { - Log.d(App.TAG, "data == null"); - if (mCameraPhotoPath != null) { - Log.d(App.TAG, "mCameraPhotoPath != null"); - results = new Uri[]{Uri.parse(mCameraPhotoPath)}; + switch (requestCode) { + case INPUT_FILE_REQUEST_CODE_NEW: { + Log.d(App.TAG,"INPUT_FILE_REQUEST_CODE_NEW:"); + if (imageUploadFilePathCallbackNew == null || resultCode != Activity.RESULT_OK) { + Log.e(App.TAG, "Callback is null: " + (imageUploadFilePathCallbackNew == null) + + " resultCode: " + resultCode); + return; } - } else { - Log.d(App.TAG, "data != null"); - String dataString = data.getDataString(); - if (dataString != null) { - Log.d(App.TAG, "dataString != null"); - results = new Uri[]{Uri.parse(dataString)}; + Uri[] results = null; + if (data == null) { + if (mCameraPhotoPath != null) { + results = new Uri[]{Uri.parse(mCameraPhotoPath)}; + } + } else { + String dataString = data.getDataString(); + if (dataString != null) { + results = new Uri[]{Uri.parse(dataString)}; + } } + imageUploadFilePathCallbackNew.onReceiveValue(results); + imageUploadFilePathCallbackNew = null; + return; + } + case INPUT_FILE_REQUEST_CODE_OLD: { + Log.d(App.TAG,"INPUT_FILE_REQUEST_CODE_OLD:"); + if (imageUploadFilePathCallbackOld == null || resultCode != Activity.RESULT_OK) { + Log.e(App.TAG, "Callback is null: " + (imageUploadFilePathCallbackOld == null) + + " resultCode: " + resultCode); + return; + } + Uri results = null; + if (data == null) { + if (mCameraPhotoPath != null) { + results = Uri.parse(mCameraPhotoPath); + } + } else { + String dataString = data.getDataString(); + if (dataString != null) { + results = Uri.parse(dataString); + } + } + imageUploadFilePathCallbackOld.onReceiveValue(results); + imageUploadFilePathCallbackOld = null; + return; } - mFilePathCallback.onReceiveValue(results); - mFilePathCallback = null; } + super.onActivityResult(requestCode, resultCode, data); } @Override