Browse Source

Android: added URL launching.

tags/2021-05-28
jules 13 years ago
parent
commit
54c82b3120
5 changed files with 18 additions and 7 deletions
  1. +5
    -5
      extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h
  2. +5
    -0
      extras/JuceDemo/Builds/Android/src/com/juce/JuceDemo.java
  3. +5
    -0
      modules/juce_core/native/java/JuceAppActivity.java
  4. +2
    -2
      modules/juce_core/native/juce_android_Files.cpp
  5. +1
    -0
      modules/juce_core/native/juce_android_JNIHelpers.h

+ 5
- 5
extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h View File

@@ -94,7 +94,7 @@ public:
{
if (! generatedCodeFolder.createDirectory())
{
errors.add ("Couldn't create folder: " + generatedCodeFolder.getFullPathName());
addError ("Couldn't create folder: " + generatedCodeFolder.getFullPathName());
return Project::Item (project, ValueTree::invalid);
}
@@ -141,7 +141,7 @@ public:
{
if (! FileHelpers::overwriteFileWithNewDataIfDifferent (f, newData))
{
errors.add ("Can't write to file: " + f.getFullPathName());
addError ("Can't write to file: " + f.getFullPathName());
return false;
}
@@ -372,7 +372,7 @@ private:
}
else
{
errors.add ("Can't create binary resources file: " + binaryDataCpp.getFullPathName());
addError ("Can't create binary resources file: " + binaryDataCpp.getFullPathName());
}
}
else
@@ -417,11 +417,11 @@ private:
void writeProjects (const OwnedArray<LibraryModule>& modules)
{
ThreadPool threadPool (4, false, 30000);
// keep a copy of the basic generated files group, as each exporter may modify it.
const ValueTree originalGeneratedGroup (generatedFilesGroup.state.createCopy());
ThreadPool threadPool (4, false, 30000);
for (Project::ExporterIterator exporter (project); exporter.next();)
{
if (exporter->getTargetFolder().createDirectory())


+ 5
- 0
extras/JuceDemo/Builds/Android/src/com/juce/JuceDemo.java View File

@@ -492,4 +492,9 @@ public final class JuceDemo extends Activity
return null;
}
public final void launchURL (String url)
{
startActivity (new Intent (Intent.ACTION_VIEW, Uri.parse (url)));
}
}

+ 5
- 0
modules/juce_core/native/java/JuceAppActivity.java View File

@@ -492,4 +492,9 @@ public final class JuceAppActivity extends Activity
return null;
}
public final void launchURL (String url)
{
startActivity (new Intent (Intent.ACTION_VIEW, Uri.parse (url)));
}
}

+ 2
- 2
modules/juce_core/native/juce_android_Files.cpp View File

@@ -228,10 +228,10 @@ bool DirectoryIterator::NativeIterator::next (String& filenameFound,
//==============================================================================
bool Process::openDocument (const String& fileName, const String& parameters)
{
const LocalRef<jstring> t (javaString (fileName));
android.activity.callVoidMethod (JuceAppActivity.launchURL, t.get());
}
void File::revealToUser() const
{
}

+ 1
- 0
modules/juce_core/native/juce_android_JNIHelpers.h View File

@@ -342,6 +342,7 @@ extern ThreadLocalJNIEnvHolder threadLocalJNIEnvHolder;
METHOD (excludeClipRegion, "excludeClipRegion", "(Landroid/graphics/Canvas;FFFF)V") \
METHOD (renderGlyph, "renderGlyph", "(CLandroid/graphics/Paint;Landroid/graphics/Matrix;Landroid/graphics/Rect;)[I") \
STATICMETHOD (createHTTPStream, "createHTTPStream", "(Ljava/lang/String;Z[BLjava/lang/String;ILjava/lang/StringBuffer;)L" JUCE_ANDROID_ACTIVITY_CLASSPATH "$HTTPStream;") \
METHOD (launchURL, "launchURL", "(Ljava/lang/String;)V") \
METHOD (showMessageBox, "showMessageBox", "(Ljava/lang/String;Ljava/lang/String;J)V") \
METHOD (showOkCancelBox, "showOkCancelBox", "(Ljava/lang/String;Ljava/lang/String;J)V") \
METHOD (showYesNoCancelBox, "showYesNoCancelBox", "(Ljava/lang/String;Ljava/lang/String;J)V") \


Loading…
Cancel
Save