Merge pull request #1 from MG-ng/develop

Fixed Bug

.github/workflows/publish-apk.yml

@@ -1,39 +1,40 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: Android APK CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request 
 # events but only for the master branch
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    # This workflow contains a single job called "build"
+    build:
+        # The type of runner that the job will run on
+        runs-on: ubuntu-latest
+
+        # Steps represent a sequence of tasks that will be executed as part of the job
+        steps:
+            # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+            - uses: actions/checkout@v1
+            - name: set up JDK 1.8
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+            - name: Make Gradle executable
+              run: chmod +x ./gradlew
+            - name: Build with Gradle
+              run: ./gradlew build
+            - name: Build Debug APK
+              run: ./gradlew assembleDebug
+            - name: Releasing using Hub
+              uses: ShaunLWM/action-release-debugapk@master
+              env:
+                  GITHUB_TOKEN: ${{ secrets.TOKEN }}
+                  APP_FOLDER: app
+                  RELEASE_TITLE: Virus Ticker Widget
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v1
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Make Gradle executable
-      run: chmod +x ./gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
-    - name: Build Debug APK
-      run: ./gradlew assembleDebug
-    - name: Releasing using Hub
-      uses: ShaunLWM/action-release-debugapk@master
-      env:
-       GITHUB_TOKEN: ${{ secrets.TOKEN }}
-       APP_FOLDER: app
-       RELEASE_TITLE: Virus Ticker Widget

app/src/main/java/website/dango/virustickerwidget/ActivityWidgetConfigure.java

@@ -227,10 +227,10 @@ public boolean onTouch( View v, MotionEvent event ) {
      */
     public static String extractLocation( String line ) {
         String country = "";
-        if( line.startsWith( "\"" ) )
-            country = line.split( "\"" )[ 1 ];
+        if( line.endsWith( "\"" ) )
+            country = line.split( "\"" )[ line.split( "\"" ).length -1 ];
         else
-            country = line.split( "," )[ 0 ];
+            country = line.split( "," )[ line.split( "," ).length -1 ];
         Log.w( TAG, "CountryB = " + country );
         if( country.isEmpty() ) country = line.split( "," )[ 1 ];
         Log.w( TAG, "CountryA = " + country );

app/src/main/res/values-de/strings.xml

@@ -10,7 +10,7 @@
     <string name="dark">Dunkel</string>
     <string name="light">Hell</string>
 
-    <string name="choose_your_country">Wähle dein Land</string>
+    <string name="choose_your_country">Wähle dein Land oder deine Stadt/Region</string>
     <string name="type">Art</string>
     <string name="theme">Aussehen</string>
 

app/src/main/res/values/strings.xml

@@ -11,7 +11,7 @@
     <string name="dark">Dark</string>
     <string name="light">Light</string>
 
-    <string name="choose_your_country">Choose your Country</string>
+    <string name="choose_your_country">Choose your country or city</string>
     <string name="type">Type</string>
     <string name="theme">Theme</string>