cobaltians/Cobalt#175: android class declaration in cobalt.json contr…

…oller becomes optional
cobaltians · Apr 24, 2019 · aa31894 · aa31894
1 parent 2462365
commit aa31894
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -34,4 +34,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <application>
+        <activity android:name=".activities.CobaltActivity" />
+    </application>
+
 </manifest>
diff --git a/src/main/java/org/cobaltians/cobalt/Cobalt.java b/src/main/java/org/cobaltians/cobalt/Cobalt.java
@@ -393,23 +393,30 @@ public Bundle getConfigurationForController(String controller) {
 
             if (controller != null
                 && controllers.has(controller)) {
-                activity = controllers.getJSONObject(controller).getString(kAndroid);
+                activity = controllers.getJSONObject(controller).optString(kAndroid, null);
                 bars = controllers.getJSONObject(controller).optJSONObject(kBars);
                 enablePullToRefresh = controllers.getJSONObject(controller).optBoolean(kPullToRefresh);
                 enableInfiniteScroll = controllers.getJSONObject(controller).optBoolean(kInfiniteScroll);
                 infiniteScrollOffset = controllers.getJSONObject(controller).optInt(kInfiniteScrollOffset, INFINITE_SCROLL_OFFSET_DEFAULT_VALUE);
                 backgroundColor = controllers.getJSONObject(controller).optString(kBackgroundColor, BACKGROUND_COLOR_DEFAULT);
             }
             else {
-                activity = controllers.getJSONObject(kDefaultController).getString(kAndroid);
+                activity = controllers.getJSONObject(kDefaultController).optString(kAndroid, null);
                 bars = controllers.getJSONObject(kDefaultController).optJSONObject(kBars);
                 enablePullToRefresh = controllers.getJSONObject(kDefaultController).optBoolean(kPullToRefresh);
                 enableInfiniteScroll = controllers.getJSONObject(kDefaultController).optBoolean(kInfiniteScroll);
                 infiniteScrollOffset = controllers.getJSONObject(kDefaultController).optInt(kInfiniteScrollOffset, INFINITE_SCROLL_OFFSET_DEFAULT_VALUE);
                 backgroundColor = controllers.getJSONObject(kDefaultController).optString(kBackgroundColor, BACKGROUND_COLOR_DEFAULT);
             }
 
-            if (activity.substring(0,1).equals(".")) activity = sContext.getPackageName() + activity;
+            if (activity == null)
+            {
+                activity = "org.cobaltians.cobalt.activities.CobaltActivity";
+            }
+            else if (activity.startsWith("."))
+            {
+                activity = sContext.getPackageName() + activity;
+            }
 
             bundle.putString(kController, controller);
             bundle.putString(kActivity, activity);
@@ -424,8 +431,7 @@ public Bundle getConfigurationForController(String controller) {
         catch (JSONException exception) {
             if (Cobalt.DEBUG) Log.e(Cobalt.TAG,     TAG + " - getConfigurationForController: check cobalt.json. Known issues: \n "
                                                     + "\t - controllers field not found or not a JSONObject \n "
-                                                    + "\t - " + controller + " controller not found and no " + kDefaultController + " controller defined \n "
-                                                    + "\t - " + controller + " or " + kDefaultController + "controller found but no " + kAndroid + "defined \n ");
+                                                    + "\t - " + controller + " controller not found and no " + kDefaultController + " controller defined \n ");
             exception.printStackTrace();
         }